Index: /applications/editors/josm/i18n/launchpad.pl
===================================================================
--- /applications/editors/josm/i18n/launchpad.pl	(revision 16972)
+++ /applications/editors/josm/i18n/launchpad.pl	(revision 16973)
@@ -3,16 +3,22 @@
 use strict;
 
-die "URL not given." if $#ARGV != 0;
 
-mkdir "new";
-die "Could not change into new data dir." if !chdir "new";
-system "wget $ARGV[0]";
-system "tar -xf laun*";
-chdir "..";
-foreach my $name (split("\n", `find new -name "*.po"`))
+if($#ARGV != 0)
 {
-  my $a=$name;
-  $a =~ s/.*-//;
-  system "mv -v $name po/$a" if -f "po/$a";
+    warn "URL not given." 
+}
+else
+{
+    mkdir "new";
+    die "Could not change into new data dir." if !chdir "new";
+    system "wget $ARGV[0]";
+    system "tar -xf laun*";
+    chdir "..";
+    foreach my $name (split("\n", `find new -name "*.po"`))
+    {
+      my $a=$name;
+      $a =~ s/.*-//;
+      system "mv -v $name po/$a" if -f "po/$a";
+    }
 }
 system "ant";
Index: /applications/editors/josm/i18n/po/ar.po
===================================================================
--- /applications/editors/josm/i18n/po/ar.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/ar.po	(revision 16973)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-08-03 16:57+0000\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-04 10:38+0000\n"
 "Last-Translator: Zargonovski <zargonovski@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -17,13 +17,6 @@
 "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: 2009-08-04 09:33+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -48,15 +41,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -81,7 +66,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -89,4 +74,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -108,8 +97,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "خطأ"
@@ -120,5 +111,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "التغييرات غير المحفوظة"
@@ -138,16 +129,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -159,13 +149,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -182,4 +173,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "إلغاء"
@@ -193,5 +185,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -200,5 +192,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -209,23 +202,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -246,5 +239,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "التحذير"
@@ -278,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -309,5 +302,5 @@
 msgstr "تقارير عن أخطاء"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -368,19 +361,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "الرجاء إختيار على الأقل طريق واحدة."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "إختر أي من :"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "إدمج العقد"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -419,5 +409,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -450,18 +440,18 @@
 msgstr "خط الطول"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "نظم العقد على حلقة"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "حرّك العقد المحددة إلى الحلقة"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -490,18 +480,18 @@
 msgstr "العدة: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "الرجاء إختيار أربعة عقد على الأقل."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -514,5 +504,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -635,13 +625,13 @@
 msgstr "ادمج عدة طرق في طريق واحدة."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "الرجاء إختر على الأقل طريقتين للدمج."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "ادمج الطرقات رغم إختلاف عضويتها ؟"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -649,13 +639,13 @@
 msgstr "إن للطرقات المختارة عضويات في علاقات مختلفة. هل تريد دمجها رغم ذلك ؟"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "على أي حال ادمج"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "غيّر الإتجاه ؟"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -663,9 +653,9 @@
 msgstr "لا يمكن ضمّ الطرقات في إتجاهاتها الحالية. هل تريد عكس إتجاهات بعضها ؟"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "أعكس  ثم إدمج"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -674,5 +664,5 @@
 msgstr "ادخل القيم لكل التناقضات."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -680,14 +670,14 @@
 msgstr "حلل التناقضات"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "ادمج {0} طرقات"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "كل الطرقات كانت فارغة"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -704,24 +694,23 @@
 msgstr "نسخ الكائنات  المختارة الى وسيط الصق"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "الرجاء إختيار شيء للنسخ."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "إنشاء حلقة"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "كوّن مستديرة من ثلاث عقد مختارة."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "هذه العقد ليست في مستديرة."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -733,8 +722,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -754,15 +743,15 @@
 msgstr "امحي الأغراض المختارة."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "الكتابة فوقه"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "الملف موجود. الكتابة عليه ؟"
@@ -823,5 +812,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -831,7 +820,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "أخطاء عند التنزيل"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -842,5 +830,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "نسخة مطابقة"
@@ -864,90 +853,36 @@
 msgstr "أخرُج من التطبيق."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "صدّر إلى GPX ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "صدّر المعطيات إلى ملف GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "لا شيء للتصدير. إحصل على بعض المعطيات أولاً."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "وصف أثر جهاز تحديد المواقع العالمي"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "أضف معلومات عن المؤلف"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "الإسم الحقيقي"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "حقوق المؤلف (URL)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "مسبق التعريف"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "تاريخ حقوق المؤلف"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "كلمات البحث"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "خيارات التصدير"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "صدّر ثم إحفظ"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"خطأ خلال تصدير {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "إختر رخصة معرفة سابقاً"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "صدّر المعطيات إلى ملف GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -963,6 +898,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1033,5 +968,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "ضمّ العقدة و الخط"
@@ -1042,12 +977,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "ادمجعلى كلّ حال"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "إحفظ المعطيات الحالية في ملف جديد."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1089,12 +1022,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "الخيار"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1154,5 +1085,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "جديد"
@@ -1243,5 +1174,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "ألصِق"
@@ -1253,5 +1184,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr ""
@@ -1298,7 +1229,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "لم أتمكن من إعادة تسمية الملف \"{0}\"."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1335,5 +1266,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "لم تفتح أي مستند لذالك لم يتم تحميل أي شيء."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1341,25 +1277,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "لم تفتح أي مستند لذالك لم يتم تحميل أي شيء."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "مستند فارغ"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "لا يحتوي المستند على أي معطيات."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "رغم ذلك احفظه"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "التناقضات"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1367,56 +1303,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "إحفظ ملف أو.أس.أم"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "إحفظ ملف GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "لم أتمكن من تحميل التفضيلات. السبب هو : {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "إمتداد الملف غير معروف: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr "حصل خطأ عند الحفظ."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "إمتداد ملف غير معروف."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "حصل خطأ عند الحفظ."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
 msgstr ""
 
@@ -1526,5 +1424,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1532,5 +1430,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1538,5 +1436,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1781,7 +1679,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "حمّل كل التغييرات إلى الخادم أو.أس.أم ."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1939,12 +1836,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "جاري تحميل التغييرات"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr "حصلت الأخطاء التالية عند التنزيل الضخم:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -1984,5 +1880,5 @@
 msgstr "النمط: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -1990,6 +1886,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2000,8 +1896,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2046,38 +1942,38 @@
 msgstr "مُنتقى"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "أضافة عقدة"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "إضافة عقدة إلى طريق"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "إضافة عقدة جديدة إلى طريق موجودة"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "انشئ عقدة جديدة"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "إختر العقدة الموجودة تحت المزلاق."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2086,14 +1982,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "إبدء طريق جديدة من العقدة الأخيرة."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "تابع طريق من العقدة الأخيرة."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "إنهي الرسم."
@@ -2113,5 +2009,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2122,5 +2018,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr ""
@@ -2155,9 +2051,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2167,18 +2063,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2392,26 +2288,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2420,5 +2316,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2509,8 +2405,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "حلل التناقضات"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2522,10 +2417,10 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "لم أجد شيء مطابق لِــ ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2569,5 +2464,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "أمحي من العلاقة"
@@ -2580,5 +2475,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr ""
@@ -2586,5 +2481,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2593,8 +2489,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "أمحي من العلاقة"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2604,9 +2499,229 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "حرك"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "إدمج {0} عقد"
+msgstr[1] "إدمج {0} عقد"
+msgstr[2] "إدمج {0} عقد"
+msgstr[3] "إدمج {0} عقد"
+msgstr[4] "إدمج {0} عقد"
+msgstr[5] "إدمج {0} عقد"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "{0} عقدة"
+msgstr[1] "{0} عقدتين"
+msgstr[2] "{0} عقدات"
+msgstr[3] "{0} عقد"
+msgstr[4] "{0} عقد"
+msgstr[5] "{0} عقد"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "التعاقب"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "طبّق ؟"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "العلاقة"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "الدور السابق"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "الدور الجديد"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "المفتاح السابق"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "القيمة السابقة"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "المفتاح الجديد"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "القيمة الجديدة"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "طبق التغييرات المختارة"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "لا تطبق التغييرات"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "خصائص "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "ملف إعدادات غير صحيح التكوين في الأسطر {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "غير قادر على فتح دليل التفضيلات: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "التفضيلات المخزنة على {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "لم أتمكن من تحميل التفضيلات. السبب هو : {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "لم أتمكن من تحميل التفضيلات من الخادم."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "درجات عشرية"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "درجات دقائق ثواني"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "ج."
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "ش."
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "غ."
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "ش."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "غيّر غرض {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "غير كامل"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2624,208 +2739,4 @@
 msgstr[5] "عقد"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "التعاقب"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "طبّق ؟"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "العلاقة"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "الدور السابق"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "الدور الجديد"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "المفتاح السابق"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "القيمة السابقة"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "المفتاح الجديد"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "القيمة الجديدة"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "طبق التغييرات المختارة"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "لا تطبق التغييرات"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "خصائص "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "ملف إعدادات غير صحيح التكوين في الأسطر {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "غير قادر على فتح دليل التفضيلات: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "التفضيلات المخزنة على {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "لم أتمكن من تحميل التفضيلات. السبب هو : {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "لم أتمكن من تحميل التفضيلات من الخادم."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "درجات عشرية"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "درجات دقائق ثواني"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "ج."
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "ش."
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "غ."
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "ش."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "غير كامل"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2861,5 +2772,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2896,5 +2807,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -2903,22 +2814,22 @@
 msgstr[1] "{0} أعضاء"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "من النوع طريق"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "خط سكة حديد"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "مجرى مياه"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "إستعمال الأرض"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -2987,10 +2898,12 @@
 msgstr "الطريق ''{0}'' المتعددة الأضلاع هي غير مغلقة."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "عضو فارغ في العلاقة."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -2998,5 +2911,5 @@
 msgstr "أمحي العضو ''{0}'' في العلاقة."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3004,57 +2917,57 @@
 msgstr "للطريق ''{0}'' أقل من نقطتين."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "دور غير معروف ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "نوع عضو غير معروف لِــ ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr "لم أجد طريق \"من\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr "لم أجد طريق \"إلى\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3106,5 +3019,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3138,4 +3051,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3170,13 +3087,25 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "لم أتمكن من قراءة العلامات المرجعية."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "لم أتمكن من كتابة العلامة المرجعية."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3209,4 +3138,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3238,14 +3168,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "الشذوذ غيرال متوقع"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
-msgstr "إستحالة الإتصال بلخادم أو.أس.أم. الرجاء فحص إتصالات الإنترنت."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3466,6 +3395,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3494,39 +3423,39 @@
 msgstr "سمعيّ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "حرّك إلى اليمين"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "الخريطة: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "حرّك إلى اليسار"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "حرّك إلى الأعلى"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "حرّك إلى الأسفل"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "كبّر الرؤية"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "صغّر الرؤية"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "المقياس"
@@ -3560,10 +3489,10 @@
 msgstr "(لا يوجد أي غرض)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "الطبقة ليست في اللائحة."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3645,12 +3574,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3659,6 +3588,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3666,47 +3595,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "الأعضاء"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#, java-format
+msgid "{0} pending tag conflicts to be resolved"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
-#, java-format
-msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3714,25 +3643,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
@@ -3932,8 +3861,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4152,5 +4081,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4163,5 +4092,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4196,6 +4125,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4208,6 +4137,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4278,7 +4207,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4341,7 +4270,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "رغم ذلك احفظه"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4368,7 +4296,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "حلّ التناقضات"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4417,97 +4345,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "الطبقات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "إفتح لائحة بكلّ التبقات المحملة."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "أمحي الطبقة المختارة."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "هناك تغييرات غير محفوظة.رغم ذالك أمحي الطبقة ؟"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "أمحي الطبقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "هل تريد فعلاً محو كلّ الطبقة ؟"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "المعلومات"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "ش."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "أحذف"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "أمحي {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "عرض/إخفاء"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "خامل"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "أمحي الطبقة المختارة."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "أنقل الطبقة المختارة صفّ إلى الأعلى."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "أنقل الطبقة المختارة صفّ إلى الأسفل."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "لوحة معلومات"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4516,22 +4439,22 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "قيمة فارغة ستمحي المفتاح."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<مختلف>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "غيّر القيم ؟"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4539,5 +4462,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4546,49 +4469,40 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "الرجاء إختيار مفتاح"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "الرجاء إختيار قيمة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Please select the objects you want to change properties for."
 msgstr "الرجاء إختيار الأغراض اللتي تريد تغيير خصائصها."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "خصائص/عضويات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "خصائص الأغراض المختارة."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "عضو من"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "غيّر العلاقة"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "أضف صفة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4605,63 +4519,77 @@
 msgstr "أضِف"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Add a new key/value pair to all objects"
 msgstr "أضف زوج جديد مفتاح/قيمة إلى كلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "حرّر الخصائص"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 msgid "Edit the value of the selected key for all objects"
 msgstr "حرّر المحتاح المنقى لكلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "الخصائص: {0} / العضويات: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "الخصائص/ العضويات"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "غيّر العلاقة"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "أمحي المفتاح المنتقى من كلّ الأغراض"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "أمحي الخصائص"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "أمحي المفتاح المنتقى من كلّ الأغراض"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "الخصائص: {0} / العضويات: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "الخصائص/ العضويات"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "العلاقات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "إفتح لائحة بكل العلاقات."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "العلاقات: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "إفتح محرر نص للعلاقة المحددة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "أمحي العلاقة المحددة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "أنشئ علاقة جديدة"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4692,5 +4620,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4762,5 +4690,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -4771,21 +4699,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "نزّل المساحة"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "أمحي العلاقة المحددة"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "موقع التنزيل"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr ""
@@ -4804,17 +4729,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "العلاقات"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "جاري تحميل المعطيات"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -4832,7 +4756,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "العلاقات"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -4843,9 +4766,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -4854,15 +4777,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "أمحي العلاقة المحددة"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -4872,9 +4794,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -4884,15 +4806,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -4900,5 +4822,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -4906,64 +4828,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
+#, fuzzy
+msgid "Select primitives for selected relation members"
+msgstr "أمحي العلاقة المحددة"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "إنزع كلّ الأغراض المختارة حالياً من العلاقة"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "أمحي العلاقة المحددة"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -4972,10 +4910,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "علاقة متناقضة"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -4984,21 +4921,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "إحفظ المعطيات الحالية."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5008,37 +4944,37 @@
 msgstr "مُوافق"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "نزّل الأعضاء"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5048,30 +4984,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "صغّر الرؤية"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5132,7 +5062,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "حمّل الخيار"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -5166,7 +5095,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "أضف إلى اخيار"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6296,5 +6224,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr ""
@@ -6320,5 +6248,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6341,5 +6269,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "صور  (*.jpg)JPEG"
@@ -6377,43 +6305,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "نقطة gps"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "إستعمل الإعدادات العامة."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "أرسم خطوط بين النقاط لهذه الطبقة."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "لا ترسم خطوط بين النقاط لهذه الطبقة."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "حدد خيارات رسم الخطوط"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "خصّص اللون"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6421,6 +6349,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6494,10 +6422,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6508,11 +6436,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6521,29 +6449,29 @@
 msgstr "محوّل من: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr "نزّل من أو.أس.أم على طول هذا المسلك"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "نزّل كلّ شيئ بين:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} أمتار"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "المساحة القصوى للمطلب:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} كلم²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6552,9 +6480,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6562,5 +6490,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6610,5 +6538,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6637,5 +6565,5 @@
 msgstr[5] "مسالك"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6647,5 +6575,5 @@
 msgstr[5] "نقاط"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6654,5 +6582,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6661,5 +6589,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6672,9 +6600,9 @@
 msgstr[5] "{0} نقطة"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6686,5 +6614,5 @@
 msgstr[5] "دالات"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6693,14 +6621,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "مزامنة الصوت"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 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:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6708,14 +6636,14 @@
 msgstr "تمّت مزامنة الصوت على النقطة {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6723,13 +6651,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "أعرض/أخفي النص/الأيقونات"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
@@ -7333,7 +7261,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
-#, fuzzy
 msgid "JOSM Plugin description URL"
-msgstr "وصف الرمز"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
@@ -7725,7 +7652,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -7801,4 +7728,9 @@
 msgstr "جاري تحضير المعطيات..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "لم أتمكن من قراءة \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -7810,7 +7742,67 @@
 msgstr "لم أتمكن من قراءة \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "ملفات GPX"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "وصف أثر جهاز تحديد المواقع العالمي"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "أضف معلومات عن المؤلف"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "الإسم الحقيقي"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "حقوق المؤلف (URL)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "مسبق التعريف"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "تاريخ حقوق المؤلف"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "كلمات البحث"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "خيارات التصدير"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "صدّر ثم إحفظ"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"خطأ خلال تصدير {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "إختر رخصة معرفة سابقاً"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -7838,4 +7830,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "دور غير معروف ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -7968,7 +7965,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "نوع   الطلاء   {0}:{1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -7983,4 +7980,5 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8012,4 +8010,32 @@
 msgstr "دخول"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "ملفات الخادم أو.أس.أم"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8067,30 +8093,26 @@
 msgstr "خطأ تحليل نحوي"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "ملفات الخادم أو.أس.أم"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "نسخة مجهولة"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "لا يوجد لــ <nd>  أي مرجع"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr ""
@@ -8140,5 +8162,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8147,9 +8169,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "نوع عضو غير معروف لِــ ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "حضّر المعطيات أو.أس.أم ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "ضذوذ تكوين معرف العقدة"
@@ -8352,7 +8379,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "المعلومات"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8720,23 +8746,23 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr ""
 
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
+msgid "Open images with AgPifoJ..."
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
-msgid "Open images with AgPifoJ..."
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -8975,5 +9001,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr ""
@@ -9020,28 +9046,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the JOSM projection to Lambert and restart"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9050,9 +9061,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
@@ -9212,12 +9223,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
 msgstr ""
 
@@ -9285,5 +9303,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr ""
@@ -9993,22 +10011,27 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr ""
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "الإسم"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10041,32 +10064,32 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+msgid "Capture GPS Track"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+msgid "Center Once"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+msgid "Center the LiveGPS layer to current position."
+msgstr ""
+
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
-msgid "Capture GPS Track"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
-msgid "Center Once"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
-msgid "Center the LiveGPS layer to current position."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
 msgid "Auto-Center"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr ""
@@ -10302,24 +10325,24 @@
 msgstr "الأفعال المسموح بها"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr "هل تريد السماح بذلك ؟"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -10558,10 +10581,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
-msgstr ""
+#, fuzzy, java-format
+msgid "{0} start"
+msgstr "{0} أمتار"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr ""
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} عقدة"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11084,10 +11109,10 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
@@ -11746,9 +11771,32 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "الرجاء إختيار أربعة عقد على الأقل."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "أمحي الطبقة"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+msgid "Start adjusting"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "لا يوجد تغييرات للتحميل."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11761,57 +11809,57 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr ""
@@ -12393,5 +12441,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -14948,5 +14996,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15248,5 +15296,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15349,5 +15397,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -19973,7 +20021,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "رياضة المحركات"
+msgstr ""
 
 #. color tertiary
@@ -23152,5 +23199,5 @@
 msgstr "القرية/المدينة"
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23161,5 +23208,5 @@
 msgstr ""
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23169,5 +23216,5 @@
 msgstr "كنيسة"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23178,5 +23225,5 @@
 msgstr "محطة محروقات"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23187,5 +23234,5 @@
 msgstr "تسوق"
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23195,5 +23242,5 @@
 msgstr "مراحيض"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23426,9 +23473,9 @@
 msgstr ""
 
-#~ msgid "Layers: {0}"
-#~ msgstr "الطبقات: {0}"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "أزل العضو في سطر الجدول الحالي من هذه العلاقة"
+#~ msgid "Unknown file extension."
+#~ msgstr "إمتداد ملف غير معروف."
+
+#~ msgid "Move"
+#~ msgstr "حرك"
 
 #~ msgid "Aborting..."
@@ -23489,4 +23536,7 @@
 #~ msgstr "لمّا مفعّل."
 
+#~ msgid "Layers: {0}"
+#~ msgstr "الطبقات: {0}"
+
 #~ msgid "Occupied By"
 #~ msgstr "المشغول من"
@@ -23497,4 +23547,7 @@
 #~ 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"
Index: /applications/editors/josm/i18n/po/bg.po
===================================================================
--- /applications/editors/josm/i18n/po/bg.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/bg.po	(revision 16973)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-08-03 15:39+0000\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-04 11:53+0000\n"
 "Last-Translator: pl71 <Unknown>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -16,13 +16,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:35+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -48,15 +41,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -81,7 +66,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -89,4 +74,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -108,8 +97,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Грешка"
@@ -120,5 +111,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Незаписани промени"
@@ -138,16 +129,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -159,13 +149,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -182,4 +173,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "Отмяна"
@@ -193,5 +185,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -200,5 +192,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -209,23 +202,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -246,5 +239,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Внимание"
@@ -278,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -309,5 +302,5 @@
 msgstr "Съобщаване на грешки"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -373,19 +366,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Моля, изберете ред за изтриване."
+msgstr "Моля, изберете слой за целта"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Изберете един от вариантите:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "Обедини точки"
+msgstr "Обединение"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -398,5 +388,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 msgid "No target layers"
-msgstr ""
+msgstr "Няма слоеве за целта"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
@@ -424,5 +414,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -455,18 +445,18 @@
 msgstr "Географска дължина:"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Подреди точките в кръг"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Преместване на избраните точки така, че да сформират окръжност."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -495,18 +485,18 @@
 msgstr "Инструмент: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Моля изберете поне четири точки."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -519,5 +509,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -582,5 +572,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90
 msgid "Precondition Violation"
-msgstr ""
+msgstr "Нарушение на предсъстоянието."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104
@@ -646,13 +636,13 @@
 msgstr "Обединява няколко отделни линии в една."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Моля, изберете поне две линии за комбиниране."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "Обединяване на линии, влизащи в различни релации?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -662,13 +652,13 @@
 "ги обеденим?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "Комбиниране въпреки всичко"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Промени посоката?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -678,9 +668,9 @@
 "посоката на някои от тях?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Връщане и Комбиниране"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -689,5 +679,5 @@
 msgstr "Въведете стойности за всички конфликти."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -695,14 +685,14 @@
 msgstr "Разрешаване на конфликти"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Обединяване {0} линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "Всички линии бяха празни"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -721,24 +711,23 @@
 msgstr "Копиране на избраните обекти в буфера за обмен."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Моля, изберете нещо за копиране."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Създаване окръжност"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Създаване на окръжност от три избрани точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "Точките не са разположени по кръг"
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr "Тези точки не са в окръжност. Излизане."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -750,8 +739,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -771,15 +760,15 @@
 msgstr "Изтриване на избраните обекти."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Презаписване"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "Файлът съществъва. Да го подменя ли?"
@@ -841,5 +830,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -849,7 +838,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "Грешки при Сваляне"
+msgstr "Проблеми при свалянето"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -860,5 +848,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Дублиране"
@@ -883,92 +872,36 @@
 msgstr "Изход от програмата."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Забележка: GPL е несъвместим с OSM лиценза. Не качвайте следи лицензирани с "
-"GPL."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Експорт до GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Експорт на данните до GPX файл."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Няма нищо за експорт. Първо съберете някакви данни."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr "Параметърът {0} не трябва да е празен"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "Описание на GPS следата"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Добави информация за автора"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Истинско име"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr "Мейл"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Авторски права (препратка)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Предефиниран"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "Авторски права (година)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Ключови думи"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Опции за експорт"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "Експорт и Записване"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Грешка при експорт {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Изберете лиценз от набора"
+msgstr "очакваше се OsmDataLayer или GpxLayer. Имаме ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "Експорт на данните до GPX файл."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -984,6 +917,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1058,5 +991,5 @@
 msgstr "Включване на точката към състава на най-близката линия от път."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "Свързване на точка с линия"
@@ -1067,12 +1000,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Сливане въпреки всичко"
+msgstr "Обединение на слоя"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "Обединяване текущия слоя с долния."
+msgstr "Обединява текущия слой в друг слой"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1118,12 +1049,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "избор"
+msgstr "Обединява избраното"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Обновява текущо избраните примитиви от сървъра."
+msgstr "Обединява текущо избраните примитиви в друг слой"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1183,5 +1112,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "Нов"
@@ -1204,4 +1133,5 @@
 msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
 msgstr ""
+"<html>Невъзможно прочитането на файла ''{0}''. Грешката е: <br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
@@ -1258,5 +1188,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
-#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1264,7 +1193,4 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 msgstr ""
-"<html>Използвате проеция EPSG:4326, което може да доведе <br>до нежелани "
-"резултати, когато се прави изправяне на ъгли.<br>Променете вашата проекция "
-"за да не се появява повече това предупреждение.<br>Желаете ли да продължите?"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1278,5 +1204,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Поставяне"
@@ -1288,5 +1214,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Поставяне на маркери"
@@ -1333,7 +1259,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Не може да се преименува файла \"{0}\"."
+msgstr "Невъзможно преименуването на файла ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1370,5 +1296,10 @@
 msgstr "Файлът {0} съществува. Презаписване?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "Не са открити пресичания. Нищо не е променяно."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1378,25 +1309,25 @@
 "информирайте за тази грешка."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "Няма отворени документи. Няма какво да се съхранява."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Празен документ"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "Документът не съдържа данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "Записване въпреки всичко"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Конфликти"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1406,57 +1337,19 @@
 "обработени все едно сте ги отменили всички. Да продължаваме ли?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "Отхвърляне конфликтите и записване"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "Съхраняване OSM файл"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "Съхраняване GPX файл"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "Запис на слой"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Невъзможно да се създаде резервно копие."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Непознато разширение на файл: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr "Възникна грешка при записване."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr "Възникна грешка при възстановяване на резервно копие."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Неизвестно файлово разширение."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "Възникна грешка при записване."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr "Възникна грешка при възстановяване на резервно копие."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1573,23 +1466,17 @@
 "средата на пътя.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
 "should verify this and correct it when necessary.</html>"
 msgstr ""
-"Всички нови линии са включени към релацията на база роля.\n"
-"Трябва да проверите това и при необходимост да внесете корекции."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
-#, fuzzy
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
 "this and correct it when necessary.</html>"
 msgstr ""
-"Всички нови линии са включени към релацията на база роля.\n"
-"Трябва да проверите това и при необходимост да внесете корекции."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1730,12 +1617,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
-#, fuzzy
 msgid "No current dataset found"
-msgstr "Не е открит слой с GPX данни."
+msgstr "Няма открит текущ набор от данни"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
-#, fuzzy
 msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr "Не могат да се намерят примитиви с ID {0} в текущата база данни."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
@@ -1848,7 +1733,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "Качване на всички промени на OSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -2006,12 +1890,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "Качване на данни"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr "Следните грешки възникнаха при масовото сваляне на данни."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -2051,5 +1934,5 @@
 msgstr "Режим: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2060,6 +1943,6 @@
 "обекти, към които има обръщение."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2070,8 +1953,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2116,38 +1999,38 @@
 msgstr "избран"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "Не може да се добави точка извън пределите на света."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Добавяне на точка"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Добавяне на точка в път"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "Свързване на съществуващ път към точка"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Добавяне на нова точка към съществуващ път"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "Добавяне на точка към път и съединяване"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "Създаване нов възел."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "Избиране на точката под курсора."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2156,14 +2039,14 @@
 msgstr[1] "Вмъкване на нов възел в {0} пътя."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "Започване на нов път от последния възел."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "Продължаване на път от последния възел."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "Завършване на чертането."
@@ -2183,5 +2066,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Отпуснете бутона на мишката за да изберете обектите в правоъгълника."
@@ -2193,5 +2076,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "Отпуснете бутона на мишката за да спрете въртенето."
@@ -2229,9 +2112,9 @@
 msgstr[1] "Добавяне и преместване на виртуален нов възел към {0} пътя"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr "Преместване на елементи"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2244,13 +2127,13 @@
 "Да се преместят ли наистина?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr "Премести"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr "Отмени преместването"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2259,5 +2142,5 @@
 "най-близката точка."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2483,27 +2366,29 @@
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+"Непознат тип на примитив: {0}. Позволените стойности са: точка, път или "
+"отношение."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Неочакван знак: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr "Липсват параметри за \"ИЛИ\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr "Липсват параметри за \"НЕ\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "Липсва затваряща скоба."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+msgstr "Грешен брой параметри на оператора за точки."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2512,5 +2397,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2600,8 +2485,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Разрешаване конфликт"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2613,10 +2497,10 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "Не е намерено съвпадение за ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2661,5 +2545,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "Изтриване от релация"
@@ -2674,5 +2558,5 @@
 "Изтриване от релацията?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr "Разделяне пътен сегмент"
@@ -2680,5 +2564,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2690,8 +2575,7 @@
 "не виждате) може да ги използват.<br>Наистина ли искате да ги триете?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "Изтриване от релация"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2701,9 +2585,223 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Преместване"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "Обедини {0} точки"
+msgstr[1] "Обедини {0} точки"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr "Изчистване на 1 примитив"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "{0} точка"
+msgstr[1] "{0} точки"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Последователност"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr "Отмяна изтриването на {0} примитива."
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Прилагане?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"При обръщане направлението на линията, предлагаме да се направят следните "
+"промени на пътищата, и техните възли за да се съхрани целостта на данните."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Релация"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Стара роля"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "Нова роля"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Стар ключ"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Стара стойност"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Нов ключ"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "Нова стойност"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Приложи избраните промени"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Не прилагай  промените"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "Моля, изберете кои промени на параметри желаете да приложите."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Свойства на "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr "Роли в релации, отнасящи се за"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Автоматично поправяне на маркерите"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Грешка в конфигурационния файл на линии {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Не може да се отвори директорията с предпочитания: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr "Файла с предпочитания е повреден. Възстановяване от старо копие в {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Предпочитанията са записани на {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Невъзможно да се качат предпочитанията. Причина: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "Невъзможно да се заредят предпочитанията от сървъра."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "Десетични градуси"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "Градуси, минути, секунди"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "Ю"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "С"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "З"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "И"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "Промени {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr "параметърът {0} трябва да е > 0. Сега е {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "непълен"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2717,210 +2815,4 @@
 msgstr[1] "възли"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr "Изчистване на 1 примитив"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Последователност"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr "Отмяна изтриването на {0} примитива."
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Прилагане?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"При обръщане направлението на линията, предлагаме да се направят следните "
-"промени на пътищата, и техните възли за да се съхрани целостта на данните."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "Релация"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "Стара роля"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "Нова роля"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Стар ключ"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Стара стойност"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Нов ключ"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "Нова стойност"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "Приложи избраните промени"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "Не прилагай  промените"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "Моля, изберете кои промени на параметри желаете да приложите."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "Свойства на "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr "Роли в релации, отнасящи се за"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "Автоматично поправяне на маркерите"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Грешка в конфигурационния файл на линии {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Не може да се отвори директорията с предпочитания: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr "Файла с предпочитания е повреден. Възстановяване от старо копие в {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Предпочитанията са записани на {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Невъзможно да се качат предпочитанията. Причина: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "Невъзможно да се заредят предпочитанията от сървъра."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "Десетични градуси"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "Градуси, минути, секунди"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "Ю"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "С"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "З"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "И"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "параметърът {0} трябва да е > 0. Сега е {1}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "непълен"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2952,5 +2844,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2983,5 +2875,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -2990,22 +2882,22 @@
 msgstr[1] "{0} членове"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "път / магистрала"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "железопътна линия"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "водоеми"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "земеползване"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -3070,10 +2962,12 @@
 msgstr "мултиполигонен път ''{0}'' не е затворен."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "В релацията има празен член."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3081,5 +2975,5 @@
 msgstr "В релацията има член ''{0}'', който е бил изтрит."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3087,57 +2981,57 @@
 msgstr "Пътя ''{0}'' е с по-малко от две точки."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr "Повече от един път \"от\" са намерени."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr "Повече от един път \"до\" са намерени."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr "Повече от един \"през\" са открити."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Неизвестна роля ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Неизвестен тип членство за ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr "Не е намерен път \"от\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr "Не е намерен път \"до\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr "Не е открит възел или път \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Пътят \"от\" не започва или не завършва във възел \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Пътят \"до\" не започва или свършва във възел \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Пътят \"от\" не започва или свършва във възел \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Пътят \"до\" не започва или свършва в път \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3189,5 +3083,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3221,4 +3115,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3259,13 +3157,25 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "Невъзможно прочитането на отметките."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "Невъзможен записът на отметките."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3300,4 +3210,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3329,15 +3240,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "Неочаквана грешка"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
 msgstr ""
-"Неуспешно свързване с OSM сървъра. Моля проверете вашата връзка към интернет."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3346,5 +3255,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -3352,6 +3261,4 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-"Грешка при установяване на връзка със сървъра на OSM {0}.\n"
-"Проверете URL на сървъра в настройките и Вашата интернет връзка."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
@@ -3571,6 +3478,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3599,39 +3506,39 @@
 msgstr "Аудио"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "Преместване надясно"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Карта: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "Преместване наляво"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Премести нагоре"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Премести надолу"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "Увеличаване"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Намаляване"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "мащаб"
@@ -3665,10 +3572,10 @@
 msgstr "(няма обект)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "слоя не е в списъка."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3749,14 +3656,14 @@
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+msgstr "роля {0} не участва в двойката за сравнение {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3765,6 +3672,6 @@
 msgstr "Маркери"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3772,47 +3679,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Членове"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#, java-format
+msgid "{0} pending tag conflicts to be resolved"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
-#, java-format
-msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3820,25 +3727,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
@@ -3854,5 +3761,5 @@
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
-msgstr ""
+msgstr "списъкът в роля {0} понастоящем не участва в двойка за сравнение"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
@@ -4038,8 +3945,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4262,5 +4169,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4273,5 +4180,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4306,6 +4213,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4318,6 +4225,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4388,7 +4295,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4451,7 +4358,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Продължи"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4478,7 +4384,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Разрешаване на конфликти"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4527,99 +4433,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Слоеве"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Отваряне списъка с всички заредени слоеве."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Изтриване избрания слой."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "Има несъхранени промени. Изтриване на слоя въпреки това?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "Изтриване на слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "Искате ли наистина да изтриете целия слой?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Информация"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "да"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "С"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Изтриване"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "Изтриване {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Показване/скриване"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Превключване видимостта на избрания слой."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "частен"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "Изтриване избрания слой."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "Обединяване текущия слоя с долния."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Преместване избрания слой един ред нагоре."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Преместване избрания слой един ред надолу."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "Информационно табло"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4628,22 +4527,22 @@
 msgstr[1] "Това ще промени до {0} обекта"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "Празна стойност изтрива ключа."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<различни>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Промени стойностите?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4651,5 +4550,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4658,49 +4557,40 @@
 msgstr[1] "Промяна параметрите на {0} обекта"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Моля, изберете ключ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Изберете стойност"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Please select the objects you want to change properties for."
 msgstr "Моля, изберете обектите, чиито параметри искате да промените."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "Параметри/Отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Параметри на избраните обекти"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "Член на"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "Промени релация"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "Изваждане на избраните обекти от релация {0}?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "Добавяне на параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4717,63 +4607,77 @@
 msgstr "Добави"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Add a new key/value pair to all objects"
 msgstr "Добавяне на нова двойка ключ/стойност за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "Редактиране на параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 msgid "Edit the value of the selected key for all objects"
 msgstr "Редактиране стойността на избрания ключ за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Свойства: {0} / Членство: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "Параметри / Отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "Промени релация"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "Изваждане на избраните обекти от релация {0}?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "Изтриване на избрания ключ за всички обекти"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "Изтриване на параметри"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "Изтриване на избрания ключ за всички обекти"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Свойства: {0} / Членство: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "Параметри / Отношения"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Релации"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "Отваряне списък с всички релации."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "Релации: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Отвори редактор за избраната релация"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Изтриване на избраната релация"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Създай нова релация"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4804,5 +4708,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4872,5 +4776,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -4881,21 +4785,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "Област за сваляне"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "Изтриване на избраната релация"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Сваляне на видимите квадранти"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr ""
@@ -4914,17 +4815,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "Релации"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "Сваляне {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -4942,7 +4842,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "Релации"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -4953,9 +4852,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+msgstr "Роля:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -4964,15 +4863,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "Премахнати елементи от Релации"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -4982,9 +4880,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -4994,15 +4892,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5010,5 +4908,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5016,66 +4914,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
+msgid "Remove all members referring to one of the selected primitives"
+msgstr ""
+
+#. putValue(NAME, tr("Remove Selected"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Relation Editor: Remove Selected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #, fuzzy
-msgid "Remove all members referring to one of the selected primitives"
-msgstr "Изтегляне на примитиви отнасящи се до един от избраните примитиви."
-
-#. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
-msgid "Relation Editor: Remove Selected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Select primitives for selected relation members"
+msgstr "Изтриване на избраната релация"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "Преместване на текущо избраните членове нагоре"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "Преместване на текущо избраните членове надолу"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Изтриване на всички текущи избрани обекти от релацията"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "Изтриване на избраната релация"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr "Не сте свързан"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5084,10 +4996,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "Конфликт в данните"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -5096,21 +5007,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Запазване на текущите данни."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5120,37 +5030,37 @@
 msgstr "ОК"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Сваляне всички непълни пътища и възли от релацията"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "Сваляне членове"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+msgstr "Установява роля за избраните членове"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+msgstr "Приложи роля"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5160,31 +5070,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
-msgstr "Потвърждение на действието на дистанционното управление"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
-msgstr ""
+msgstr "Потвърди празна роля"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Намаляване"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "Преместване на текущо избраните членове надолу"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5245,7 +5148,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "Зареди избраното"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -5279,7 +5181,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "Промяна местоположение"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6413,5 +6314,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Изображения с данни за местоположение"
@@ -6437,5 +6338,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6454,5 +6355,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "Изображения JPEG (*.jpg)"
@@ -6490,43 +6391,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "GPS точка"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Настройка рисуването на линии"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Използвай глобалните настройки."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Чертай линии между точките на този слой."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Не чертай линии между точките на този слой."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Избиране варианти за чертане на линиите."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Избор цвят"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6534,6 +6435,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6607,10 +6508,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Преобразувай в слой данни"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6621,11 +6522,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6634,29 +6535,29 @@
 msgstr "Преобразувано от: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr "Свали от OSM по дължина на тази следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "Свали всичко в пределите на:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} метри"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "Максимална област за една заявка:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6667,9 +6568,9 @@
 "Продължаване?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Няма GPX следа в слоя за да асоциираме звук с нея."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6679,5 +6580,5 @@
 "са пропуснати или преместени в началото."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6729,5 +6630,5 @@
 msgstr "Преобразувай в слой GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6752,5 +6653,5 @@
 msgstr[1] "следи"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6758,5 +6659,5 @@
 msgstr[1] "точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6765,5 +6666,5 @@
 msgstr[1] "следа с {0} точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6772,5 +6673,5 @@
 msgstr[1] "{0} се състои от {1} следи"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6779,9 +6680,9 @@
 msgstr[1] "{0} точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "GPS маркер"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6789,5 +6690,5 @@
 msgstr[1] "маркери"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6796,9 +6697,9 @@
 msgstr[1] "{0} се състои от {1} маркери"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "Синхронизиране аудио"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -6807,5 +6708,5 @@
 "синхронизиращ сигнал."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6813,14 +6714,14 @@
 msgstr "Аудио синхронизирано на точка {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 msgid "Unable to synchronize in layer being played."
 msgstr "Невъзможно да се синхронизира в слоя, който се изпълнява."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 msgid "Make Audio Marker at Play Head"
 msgstr "Установи аудио маркер на позицията на прослушване"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6830,14 +6731,14 @@
 "маркера."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 "Няма съществуващи аудио маркери в този слой, спрямо които да се отмести."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Показване/скирване на Текст/Икони"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Превключване видимостта на маркер текста и икони."
@@ -7478,7 +7379,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
-#, fuzzy
 msgid "JOSM Plugin description URL"
-msgstr "Описание на символ"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
@@ -7900,7 +7800,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -7972,4 +7872,9 @@
 msgstr "Подготвяне на данните..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "Не може да се прочете \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -7981,7 +7886,69 @@
 msgstr "Не може да се прочете \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Забележка: GPL е несъвместим с OSM лиценза. Не качвайте следи лицензирани с "
+"GPL."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "GPX файлове"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "Описание на GPS следата"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Добави информация за автора"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Истинско име"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr "Мейл"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Авторски права (препратка)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Предефиниран"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "Авторски права (година)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Ключови думи"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Опции за експорт"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "Експорт и Записване"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Грешка при експорт {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Изберете лиценз от набора"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -8009,4 +7976,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Грешка при разбор: невалидна структура на gpx документа"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Неизвестна роля ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8141,7 +8113,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "Сканиране на директория {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8156,4 +8128,5 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8185,4 +8158,32 @@
 msgstr "Вход"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "OSM сървърни файлове"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, fuzzy, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr "очакваше се OsmDataLayer или GpxLayer. Имаме ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8240,30 +8241,26 @@
 msgstr "Грешка при разбор."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "OSM сървърни файлове"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Неизвестна версия"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr "Версията липсва от OSM данните."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr "Неизвестна версия: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr "Намерен е елемент <nd> извън път."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "към <nd> няма обръщения ref."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "Открит е маркер <member> извън релация."
@@ -8313,5 +8310,5 @@
 msgstr "Липсва необходимия атрибут \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8320,9 +8317,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "Неизвестен тип членство за ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "Подготовка на OSM данните..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "Неправилен код на точка"
@@ -8446,8 +8448,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
-"Внимание - заявено е зареждане на модул {0}. Този модул не се изисква вече."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8541,7 +8542,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "Информация за разширението не е намерена."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8934,23 +8934,23 @@
 msgstr "Намерен е празен файл в директория {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Грешка при четене на файлове от директория {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr "Корелиране към GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} открити с gps тагове."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "Отваряне на изображения с AgPifoJ..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9200,5 +9200,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Грешка при зареждане на файла"
@@ -9247,30 +9247,13 @@
 msgstr "Избор на Tableau d'Assemblage"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr "Кадастър"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr "Авто-определяне източници"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr "Невалидна проекция"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr "Променете първо проекцията до {0}."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the JOSM projection to Lambert and restart"
-msgstr ""
-"За да включите кадастровия WMS plugin, променете\n"
-"проекцията на JOSM до Ламбертова и рестартирайте"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9279,9 +9262,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
@@ -9456,13 +9439,23 @@
 msgstr "Екстракт на белезите на сграда"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr "Зареждане на изображение от френски кадастърен WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Кадастър: {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+#, fuzzy
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
+msgstr ""
+"За да включите кадастровия WMS plugin, променете\n"
+"проекцията на JOSM до Ламбертова и рестартирайте"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9532,5 +9525,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr "Настройка на WMS"
@@ -10260,22 +10253,27 @@
 msgstr "Невъзможно да се получи изображение"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr "Свързване"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr "Свързан"
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr "Не сте свързан"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr "Неуспешна връзка"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "име"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10308,33 +10306,33 @@
 msgstr "LiveGPS слой"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
 msgstr "Записване на GPS следа"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 "Свързване с gpsd сървъра и показване на текущата позиция на слоя LiveGPS."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center Once"
 msgstr "Центриране веднъж"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center the LiveGPS layer to current position."
 msgstr "Центриране на LiveGPS слоя към текущата позиция."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr "Авто-Център"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Постоянно центриране на LiveGPS слоя към текущата позиция."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -10585,25 +10583,25 @@
 msgstr "Позволени действия"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 "Дистанционното управление получи заявка за зареждане на данни от API-то."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr "Подробности на заявката: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr "Желаете ли да разрешите това?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr "Потвърждение на действието на дистанционното управление"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -10845,10 +10843,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
+#, fuzzy, java-format
+msgid "{0} start"
 msgstr "начало"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr "край"
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} точка"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11392,10 +11392,10 @@
 msgstr "Пресичащи се пътища"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr "Повтарящи се точки"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Този тест проверява за точки, които се намират на едно и също място."
@@ -12070,9 +12070,33 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr "Настройте позицията на избрания WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "Моля, изберете ред за редактиране"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "Изтриване на слой"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Start adjusting"
+msgstr "Започни маршрутизиране"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "Няма промени за качване."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -12087,15 +12111,15 @@
 msgstr "Автоматично сваляне"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS слой ({0}), автоматично сваляне в мащаб {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS слой ({0}), сваляне в мащаб {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12104,42 +12128,42 @@
 "разделителната способност."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Сваляне на видимите квадранти"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Смяна разделителна способност"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Презареждане грешни квадранти"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Алфа канал"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Запис на WMS слоя във файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "Зареждане на WMS слой от файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Неподдъжана WMS файлова версия; намерена {0}, очаквана {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Грешка във формата на файла"
@@ -12764,5 +12788,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -15319,5 +15343,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15619,5 +15643,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15720,5 +15744,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -20344,7 +20368,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "Магистрала"
+msgstr ""
 
 #. color tertiary
@@ -23523,5 +23546,5 @@
 msgstr "Град/Село"
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23532,5 +23555,5 @@
 msgstr "Еднопосочна"
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23540,5 +23563,5 @@
 msgstr "Църква"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23549,5 +23572,5 @@
 msgstr "Бензиностанция"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23558,5 +23581,5 @@
 msgstr "Пазаруване"
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23566,5 +23589,5 @@
 msgstr "Тоалетна"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23797,47 +23820,35 @@
 msgstr "Terraserver Urban"
 
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Невъзможност да се инициализира API. Моля, пробвайте по-късно."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Неуспешна иницилизация на API"
-
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
+#~ "Failed to access system property ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
 #~ msgstr ""
-#~ "Не са открити данни за обновяване. Отваряли или зареждали ли сте слой с "
-#~ "данни?"
-
-#~ msgid "No data"
-#~ msgstr "Липсват данни"
-
-#~ msgid "Failed to update the selected primitives."
-#~ msgstr "Грешка при обновяването на избраните примитиви."
-
-#~ msgid "Update failed"
-#~ msgstr "Неуспешно обновяване."
-
-#~ msgid "Missing primitive"
-#~ msgstr "Липсва примитив."
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Слоеве: {0}"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Изтриване на члена от текущия ред на таблицата от тази релация"
+#~ "Невъзможен достъп до системната стойност ''{0}'' поради настройките за "
+#~ "сигурност. Съобщение: {1}"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Неизвестно файлово разширение."
+
+#~ msgid "An error occurred while saving. Error is: {0}"
+#~ msgstr "Възникна грешка при записа. Грешката е: {0}"
 
 #~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
+#~ "<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
+#~ "html>"
 #~ msgstr ""
-#~ "Разширението не може да бъде изтрито. Моля съобщете на разработчиците на "
-#~ "JOSM за този проблем."
-
-#~ msgid "Validate"
-#~ msgstr "Проверка"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Проверяване на избранато или всички данни."
+#~ "<html>Възникна грешка при въстановяването на бекъп файла.<br> Грешката е: "
+#~ "<br>{0}</html>"
+
+#~ msgid "Move"
+#~ msgstr "Преместване"
+
+#~ msgid "Invalid projection"
+#~ msgstr "Невалидна проекция"
+
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Променете първо проекцията до {0}."
+
+#~ msgid "end"
+#~ msgstr "край"
 
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
@@ -23924,4 +23935,7 @@
 #~ msgid "Not implemented yet."
 #~ msgstr "Не е добавено още."
+
+#~ msgid "Layers: {0}"
+#~ msgstr "Слоеве: {0}"
 
 #~ msgid "Conflicts: {0}"
@@ -24070,4 +24084,7 @@
 #~ "указана в списъка с промени."
 
+#~ msgid "Remove the member in the current table row from this relation"
+#~ msgstr "Изтриване на члена от текущия ред на таблицата от тази релация"
+
 #~ msgid "Login name (email) to the OSM account."
 #~ msgstr "Потребителско име (email) за OSM акаунт."
@@ -24101,4 +24118,11 @@
 #~ msgid "Add a new tagging preset source to the list."
 #~ msgstr "Добавяне на нов източник на шаблони за маркиране към списъка."
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr ""
+#~ "Разширението не може да бъде изтрито. Моля съобщете на разработчиците на "
+#~ "JOSM за този проблем."
 
 #~ msgid "Error deleting plugin file: {0}"
@@ -24150,4 +24174,7 @@
 #~ msgstr "изображението не е заредено"
 
+#~ msgid "Validate"
+#~ msgstr "Проверка"
+
 #~ msgid "Open the OpenStreetBugs window and activate the automatic download"
 #~ msgstr ""
@@ -24169,4 +24196,7 @@
 #~ "Ламбертова зона {0} в кеша е несъвместима с текущата Ламбертова зона {1}"
 
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Проверяване на избранато или всички данни."
+
 #~ msgid "Remove Selected"
 #~ msgstr "Изтриване на избраното"
@@ -24177,7 +24207,4 @@
 #~ msgid "Delete and Download"
 #~ msgstr "Изтриване и Зареждане"
-
-#~ msgid "No intersections found. Nothing was changed."
-#~ msgstr "Не са открити пресичания. Нищо не е променяно."
 
 #~ msgid "Move Down"
@@ -24210,4 +24237,11 @@
 #~ "Възникна грешка при опит да се съотнесат снимките към GPX следата. Може "
 #~ "да промените настройките на ръчно съотнасяне на снимки."
+
+#~ msgid ""
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
+#~ msgstr ""
+#~ "Не са открити данни за обновяване. Отваряли или зареждали ли сте слой с "
+#~ "данни?"
 
 #~ msgid "The following errors occured during mass download:"
@@ -24242,7 +24276,4 @@
 #~ msgid "Directly load TCX files from JOSM."
 #~ msgstr "Директно зареждане на TCX файлове от JOSM."
-
-#~ msgid "Start routing"
-#~ msgstr "Започни маршрутизиране"
 
 #~ msgid "Remove route nodes"
@@ -24287,2 +24318,20 @@
 #~ msgid "Delete mine"
 #~ msgstr "Изтриване на моите"
+
+#~ msgid "API initialization failed"
+#~ msgstr "Неуспешна иницилизация на API"
+
+#~ msgid "Failed to initialize API. Please try again later."
+#~ msgstr "Невъзможност да се инициализира API. Моля, пробвайте по-късно."
+
+#~ msgid "No data"
+#~ msgstr "Липсват данни"
+
+#~ msgid "Update failed"
+#~ msgstr "Неуспешно обновяване."
+
+#~ msgid "Failed to update the selected primitives."
+#~ msgstr "Грешка при обновяването на избраните примитиви."
+
+#~ msgid "Missing primitive"
+#~ msgstr "Липсва примитив."
Index: /applications/editors/josm/i18n/po/cs.po
===================================================================
--- /applications/editors/josm/i18n/po/cs.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/cs.po	(revision 16973)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-07-21 15:36+0000\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-07 09:08+0000\n"
 "Last-Translator: Jezevec <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -16,13 +16,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:34+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -47,15 +40,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -80,7 +65,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -88,4 +73,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -107,8 +96,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Chyba"
@@ -119,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Neuložené změny"
@@ -137,16 +128,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -158,13 +148,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -181,4 +172,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "Zrušit"
@@ -192,5 +184,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -199,5 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -208,23 +201,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -245,5 +238,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Varování"
@@ -277,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -308,5 +301,5 @@
 msgstr "Nahlášení chyby"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -332,5 +325,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
 msgid "License"
-msgstr ""
+msgstr "Licence"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
@@ -372,19 +365,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Zvolte řádek k vymazání"
+msgstr "Prosím vyberte cílovou vrstvu."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Vyberte buď:"
+msgstr "Vybrat cílovou vrstvu"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "Spojit uzly"
+msgstr "Sloučit"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -397,5 +387,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 msgid "No target layers"
-msgstr ""
+msgstr "Žádné cílové vrstvy"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
@@ -423,5 +413,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -454,18 +444,18 @@
 msgstr "Zeměpisná délka"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Seřadit uzly do kruhu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Přesunout označené uzly do kruhu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -494,18 +484,18 @@
 msgstr "Nástroj: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Vyberte minimálně 4 uzly"
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -518,5 +508,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -645,13 +635,13 @@
 msgstr "Spojit více cest do jedné"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Prosím zvolte minimálně dvě cesty ke spojení"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "Spojit cesty patřící do jiné relace?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -659,13 +649,13 @@
 msgstr "Vybrané cesty patří do jiné relace. Opravdu je chcete spojit?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "Přesto zkombinovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Změnit směr ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -675,9 +665,9 @@
 "orientaci?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Otočit a zkombinovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -686,5 +676,5 @@
 msgstr "Zadej hodnoty pro všechny konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -692,14 +682,14 @@
 msgstr "Vyřešit konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Kombinovat {0} cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "Všechny cesty byli prázdné"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -716,24 +706,23 @@
 msgstr "Vybrat označené objekty pro vložení."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Prosím zvol něco ke kopírování"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Vytvořit kruh"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Vytvořit kruh ze tří uzlů"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "Tyto uzly nejsou v kruhu"
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr "Tyto body nejsou v kruhu. Přerušuji."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -746,8 +735,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -767,15 +756,15 @@
 msgstr "Smazat označené objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Přepsat"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "Soubor již existuje. Chcete jej přepsat ?"
@@ -827,5 +816,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download primitives referring to one of the selected primitives"
-msgstr ""
+msgstr "Stáhnout prvky odkazující na jeden z vybraných prvků"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42
@@ -836,5 +825,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -844,16 +833,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "Chyby při stahování"
+msgstr "Konflikty během stahování"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
 #, java-format
 msgid "({0}/{1}) Loading parents of primitive {2}"
-msgstr ""
+msgstr "({0}/{1}) Nahrávání rodičů prvku {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Duplikovat"
@@ -877,92 +866,36 @@
 msgstr "Ukončit JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Poznámka: GPL není kompatibilní s licencí OSM.  Nestahujte prosím cesti "
-"licencované pod GPL."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Exportovat do GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Exportovat data do GPX souboru."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Nic nevyexportováno. Nejdříve stáhněte data."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+msgstr "parametr ''{0}'' nesmí být null"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "popis gps trasy"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Přidat informace autora"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Skutečné jméno"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr "Email"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Copyright (URL)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Předdefinováno"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "Copyright"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Klíčová slova"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Nastavení Exportu"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "Exportovat a uložit"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Chyba při exportu {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Zvolte předdefinovanou licenci"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "Exportovat data do GPX souboru."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -978,6 +911,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1050,5 +983,5 @@
 msgstr "Napojit bod na nejbližší část cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "Spojit uzly a linie"
@@ -1059,12 +992,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Přesto sloučit"
+msgstr "Sloučit vrstvu"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "Spojit vrstvy pod označenou"
+msgstr "Sloučit aktuální vrstvu do jiné vrstvy"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1107,12 +1038,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "výběr"
+msgstr "Sloučit výběr"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Aktualizovat právě vybrané prvky ze serveru"
+msgstr "Sloučit vybrané prvky do jiné vrstvy"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1172,5 +1101,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "Nový"
@@ -1192,5 +1121,5 @@
 #, java-format
 msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
-msgstr ""
+msgstr "<html>Nemohu přečíst soubor ''{0}''. Chyba je: <br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
@@ -1245,5 +1174,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
-#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1251,7 +1179,4 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 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?"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1265,5 +1190,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Vložit"
@@ -1275,5 +1200,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Vložit Popisky"
@@ -1320,7 +1245,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Nemohu přejmenovat soubor \"{0}."
+msgstr "Nemohu přejmenovat soubor ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1357,5 +1282,10 @@
 msgstr "Soubor {0} již existuje. Přepsat ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "Nenalezen průsečík. Nic nebylo změněno."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1364,25 +1294,25 @@
 "Interní chyba: nemohu ověřit podmínky pro žádné vrstvy. Reportuje jako chybu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "Není otevřený žádný dokument, není co uložit."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Prázdný dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "Dokument neobsahuje žádná data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "Přesto uložit"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1392,57 +1322,19 @@
 "vyřešeny, jako by byly všechny odmítnuty. Pokračovat?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "Zamítnout konflikty a uložit"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "Uložit OSM soubor"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "Uložit GPX soubor"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "Ulož vrstvu"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Nemohu zálohovat soubor."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Neznámá koncovka souboru: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr "<html>Při komunikaci se serverem doslo k chybě<br>Detaily: {0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr "Během obnovení zálohy došlo k chybě."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Neznámá přípona souboru."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "Během ukládání došlo k chybě."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr "Během obnovení zálohy došlo k chybě."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1556,24 +1448,17 @@
 "cesty.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
 "should verify this and correct it when necessary.</html>"
 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."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
-#, fuzzy
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
 "this and correct it when necessary.</html>"
 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."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1714,12 +1599,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
-#, fuzzy
 msgid "No current dataset found"
-msgstr "Nenalezena vrstva s GPX daty."
+msgstr "Nenalezena aktuální datová sada"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
-#, fuzzy
 msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr "V aktuální datové sadě nemohu nalézt primitiva s id {0}"
+msgstr "Prvek s id {0} nebyl v aktuální datové sadě nalezen"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
@@ -1840,7 +1723,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "Nahrát všechy změny na OSM server."
+msgstr "Nahrát všechny změny v jednom požadavku"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1849,4 +1731,6 @@
 "changed primitive"
 msgstr ""
+"Povoleno nahrává všechny změny najednou, zakázáno nahrává změnu každého "
+"prvku samostatně"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464
@@ -1998,12 +1882,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "Nahrávám data"
+msgstr "Aktualizuji data"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr "Následující chbya nastala během hromadného stahování:"
+msgstr "Během hromadného stahování došlo k následujícím chybám:{0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -2048,5 +1931,5 @@
 msgstr "Režim: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2056,6 +1939,6 @@
 "když mažete trasu. CTRL: smazat referenční objekty."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2066,8 +1949,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2112,38 +1995,38 @@
 msgstr "vybráno"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "Nemůžu přidat uzel ležící mimo Zemi."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Přidat uzel"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Přidat uzel do cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "Spojit existující cestu do uzlu"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Přidat nový uzel do již existující cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "Přidat uzel do cesty a spojit"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "Vytvořit nový uzel."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "Vybrat uzel pod kurzorem."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2153,14 +2036,14 @@
 msgstr[2] "Vložit nový uzel do {0} cest."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "Začít novou cestu od posledního uzlu."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "Pokračovat v cestě od posledního uzlu."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "Dokončit kreslení"
@@ -2180,5 +2063,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Pusť myší tlačítko k vybrání obejktů v obdélníku"
@@ -2189,5 +2072,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "Pusť myší tlačítko k zastavení otaáčení"
@@ -2223,9 +2106,9 @@
 msgstr[2] "Přidat a posunout virtuální nový uzel do {0} cest"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr "Přesun prvků"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2238,13 +2121,13 @@
 "Opravdu je chcete přesunout?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr "Přesunout je"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr "Vrátit zpět přesun"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2252,5 +2135,5 @@
 "Uvolněte tlačítko myši pro ukončení pohybu. Ctrl sloučí s nejbližším uzlem."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2290,5 +2173,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
-msgstr ""
+msgstr "Nelze hledat jelikož nejsou nahrána žádná data."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66
@@ -2476,26 +2359,26 @@
 msgstr "Neznámý prvek: {0}. Povolené hodnoty jsou bod, cesta nebo relace"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr "Chybějící argument pro \"NEBO\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr "Chybějící argument pro \"NOT\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "Očekávám uzavírací závorku."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Chybný počet parametrů pro operátor nodes."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2506,5 +2389,5 @@
 "čísel, například nodes:10-20."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2595,8 +2478,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Vyřešit konfklikt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2606,12 +2488,14 @@
 "primitmive ''{1}''"
 msgstr ""
+"Varování: vrstva ''{0}'' již neexistuje. Nelze odstranit konflikt prvku "
+"''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "Nebyly nalezeny záznamy pro \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2655,5 +2539,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "Odstranit z relace"
@@ -2668,5 +2552,5 @@
 "Smazat z relace?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr "Rozdělit segment cesty"
@@ -2674,5 +2558,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2684,8 +2569,7 @@
 "<br>Opravdu je chcete smazat?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "Odstranit z relace"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2695,9 +2579,227 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Přesunout"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "Spojit {0} uzly"
+msgstr[1] "Spojit {0} uzly"
+msgstr[2] "Spojit {0} uzly"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr "Odstraňuji 1 prvek"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr "odstraňování reference z cesty {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+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}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr "Odstranit člena relace {0} {1}"
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "Otočit {0} {1}"
+msgstr[1] "Otočit {0} {1}"
+msgstr[2] "Otočit {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Sekvence"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr "Obnovit {0} prvků"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr "Vyřešte konflikt verzí mezi {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr "Hlavní datová sada neobsahuje bod {0}"
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Použít ?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"Byl změněn směr cesty. Mají se provést zásledující změny vlastností cesty a "
+"jejích bodů, z důvodů udržení konzistence dat?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Vztah"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Stará role"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "Nová role"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Starý klíč"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Stará hodnota"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Nový klíč"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "Nová hodnota"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Použít zvolené změny"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Neprovádět změny"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "Prosím vyberte které změny vlastností chcete použít."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Vlastnosti "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr "Role v relaci odkazující na"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Automatická korekce popisků"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Poškozený konfigurační soubor na řádku {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Nelze otevřít adresář s nastavením: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+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}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Předvolby uloženy na {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Nemohu nahrát předvolby. Důvod: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "Nemohu nahrát předvolby ze serveru."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "Desetinné stupně"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "Stupně minuty sekundy"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "J"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "Z"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "V"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "Změnit {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr "požadován parametr {0} > 0. Zadáno {1}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "nekompletní"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2712,212 +2814,4 @@
 msgstr[2] "uzly"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr "Odstraňuji 1 prvek"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr "odstraňování reference z cesty {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-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}"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr "Odstranit člena relace {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr "Otočit {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Sekvence"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr "Obnovit {0} prvků"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "Vyřešte konflikt verzí mezi {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr "Hlavní datová sada neobsahuje bod {0}"
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Použít ?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"Byl změněn směr cesty. Mají se provést zásledující změny vlastností cesty a "
-"jejích bodů, z důvodů udržení konzistence dat?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "Vztah"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "Stará role"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "Nová role"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Starý klíč"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Stará hodnota"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Nový klíč"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "Nová hodnota"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "Použít zvolené změny"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "Neprovádět změny"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "Prosím vyberte které změny vlastností chcete použít."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "Vlastnosti "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr "Role v relaci odkazující na"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "Automatická korekce popisků"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Poškozený konfigurační soubor na řádku {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Nelze otevřít adresář s nastavením: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-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}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Předvolby uloženy na {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Nemohu nahrát předvolby. Důvod: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "Nemohu nahrát předvolby ze serveru."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "Desetinné stupně"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "Stupně minuty sekundy"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "J"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "Z"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "V"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "požadován parametr {0} > 0. Zadáno {1}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "nekompletní"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2950,5 +2844,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2982,5 +2876,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -2990,22 +2884,22 @@
 msgstr[2] "{0} prvků"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "silnice"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "železnice"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "vodní tok"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "využití oblasti (landuse)"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -3071,10 +2965,12 @@
 msgstr "Cesta v multipolygonu ''{0}'' není uzavřena."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "Prázdný prvek v relaci."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3082,5 +2978,5 @@
 msgstr "Odstraněn prvek ''{0}'' z relace."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3088,57 +2984,57 @@
 msgstr "Cesta ''{0}'' s méně, než dvěmi body."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr "Nalezena více než jedna \"from\" cesta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr "Nalezeno více cílových \"to\" cest."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr "Nalezen více než jeden \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Neznámá role ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Neznámý typ prvku pro ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr "Nenazezena příchozí cesta \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr "Nenalezena odchozí cesta \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr "Nenalezen \"via\" uzel nebo cesta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Cesta \"from\" nezačíná, ani nekončí v uzlu \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Cesta \"to\" nezačíná nebo nekončí v uzlu \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Cesta \"from\" nezačíná nebo nekončí v uzlu \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Cesta \"to\" nezačíná nebo nekončí na cestě \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3190,5 +3086,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3222,4 +3118,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3260,13 +3160,25 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "Nemohu přečíst záložky."
+msgstr "<html>Nelze načíst záložky.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "Nemohu zapsat do záložek."
+msgstr "<html>Záložku nelze uložit.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3304,4 +3216,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3333,16 +3246,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "Neočekávaná výjimka"
+msgstr "Bezpečnostní vyjímka"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
 msgstr ""
-"Nemohu se připojit k OSM serveru. Prosím zkontrolujte si připojení k "
-"internetu."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3351,5 +3261,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -3357,6 +3267,4 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-"Selhalo navázání komunikace s OSM serverem {0}.\n"
-"Zkontrolujte URL serveru v nastavení a vaše připojení k internetu."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
@@ -3575,6 +3483,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3603,39 +3511,39 @@
 msgstr "Zvuk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "Posunout doprava"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Mapa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "Posunout doleva"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Posunout nahoru"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Posunout dolů"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "Přiblížit"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Oddálit"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "měřítko"
@@ -3669,13 +3577,13 @@
 msgstr "(žádný objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "vrstva není v seznamu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
-msgstr ""
+msgstr "Vrstva ''{0}'' musí být v  seznamu vrstev"
 
 #: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
@@ -3754,12 +3662,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3768,6 +3676,6 @@
 msgstr "Značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3775,47 +3683,47 @@
 msgstr "Body"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Členové"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#, java-format
+msgid "{0} pending tag conflicts to be resolved"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
-#, java-format
-msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3823,25 +3731,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Členi (s konflikty)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Vlastnosti (s konflikty)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Řešení konfliktů"
@@ -4055,8 +3963,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4286,5 +4194,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4297,5 +4205,5 @@
 msgstr "Prvek"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 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í"
@@ -4330,6 +4238,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4342,6 +4250,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4412,7 +4320,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4477,7 +4385,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Přesto pokračovat"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4486,5 +4393,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>You didn''t finish to merge the differences in this conflict."
@@ -4494,12 +4401,8 @@
 "<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210
 msgid "Conflict not resolved completely"
-msgstr ""
+msgstr "Konflikt není vyřešen kompletně"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:246
@@ -4508,7 +4411,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Vyřešte konflikt verzí mezi {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4557,99 +4460,92 @@
 msgstr "Zobrazit historii vybraného prvku"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Otevřít seznam všech nahraných vrstev."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Smazat označenou vrstvu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "Jsou zde neuložené změny. Přesto smazat vrstvu?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr "Ve vrstvě ''{0}'' jsou neuložené změny. Chcete vrstvu skutečně smazat?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "Smazat vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "Opravdu chcete smazat celou vrstvu?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr "Opravdu chcete smazat vrstvu ''{0}''?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Informace"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr "Potvrzení"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "ano"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr "Ano"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr "Ne"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Smazat"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr "Smazat vše"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "Smazat {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr "Mazání vrstvy {0} z {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Zobrazit/Skrýt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Přepnout viditelnost zvolené vrstvy."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "soukromý"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr "Aktivovat"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "Smazat označenou vrstvu."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr "Aktivovat vybranou vrstvu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "Spojit vrstvy pod označenou"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr "Sloučit tuto vrstvu do jiné vrstvy"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Přesunout zvolenou vrstvu o řádek nahoru."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Přesunout zvolenou vrstvu o řádek dolů."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "Informační nástěnka"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr "Informace o vrstvě"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4659,22 +4555,22 @@
 msgstr[2] "Toto změní až  {0} objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "Prázdná hodnota smaže klíč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<různé>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Změnit hodnoty ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4682,5 +4578,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4690,49 +4586,40 @@
 msgstr[2] "Změnit vlastnosti až  {0} objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Prosím zvolte klíč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Vyberte prosím hodnotu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 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/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "Vlastnosti/Členství"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Vlastnosti pro zvolené objekty"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "Člen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "Změnit relaci"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "Opravdu smazat výběr z relace {0}?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "Přidat vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4749,63 +4636,77 @@
 msgstr "Přidat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Add a new key/value pair to all objects"
 msgstr "Přidat nový pár klíč/hodnota ke všem objektům"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "Upravit vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 msgid "Edit the value of the selected key for all objects"
 msgstr "Změnit hodnotu zvoleného klíče pro všechny objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Vlastnosti: {0} / Členství: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "Vlastnosti / Členství"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "Změnit relaci"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "Opravdu smazat výběr z relace {0}?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "Smaže zvolený klíč ve všech objektech"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "Smazat vlastnosti"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "Smaže zvolený klíč ve všech objektech"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Vlastnosti: {0} / Členství: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "Vlastnosti / Členství"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "Otevřít seznam všech relací"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relace: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Otevřít editor pro zvolenou relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Smazat vybrané relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Vytvořit novou relaci"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4836,5 +4737,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4906,31 +4807,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
-#, fuzzy
 msgid "Download all child relations (recursively)"
-msgstr "Stáhnout členy relace"
+msgstr "Stáhnout všechny potomky relace (rekurzivně)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "Stáhnout plochu"
+msgstr "Stáhnout všechny potomky"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "Smazat vybrané relace"
+msgstr "Stáhnout vybrané relace"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Nahrát viditelné dlaždice"
+msgstr "Stáhnout vybrané potomky"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr "Stáhnout členy relace"
@@ -4947,19 +4844,19 @@
 "loaded"
 msgstr ""
+"<html>Potomek relace<br>{0}<br>byl smazán na serveru. Nemůže být stažen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "Nevybrána žádná relace"
+msgstr "Relace je smazána"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "Stahuji Plugin {0}..."
+msgstr "Stahování relace {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -4969,15 +4866,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
 msgid "Tags and Members"
-msgstr ""
+msgstr "Značky a Členové"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172
 msgid "Parent Relations"
-msgstr ""
+msgstr "Rodičovské relace"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "Relace"
+msgstr "Potomci relace"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -4988,9 +4884,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -4999,15 +4895,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "Prvek odstraněn z relací"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -5017,9 +4912,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+msgstr "Více členů odkazuje na stejný prvek"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -5028,89 +4923,111 @@
 "''{0}''.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+"<html>POukoušíte se vložit relaci samu do sebe.<br><br>Toto vytvoří cyklický "
+"odkaz a proto není taková úprava povolena.<br>Přeskakuji relaci ''{0}''.</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+msgstr "Přidat všechny vybrané prvky z aktuální datové sady před prvního člena"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+"Přidat všechny vybrané prvky z aktuální datové sady za posledního člena"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
 "member"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+"Přidat všechny vybrané prvky z aktuální datové sady před prvního vybraného "
+"člena"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
 "member"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+"Přidat všechny vybrané prvky z aktuální datové sady za posledního vybraného "
+"člena"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
+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ů"
+
+#. putValue(NAME, tr("Remove Selected"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Relation Editor: Remove Selected"
+msgstr "Editor relací: Odstranit vybrané"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #, fuzzy
-msgid "Remove all members referring to one of the selected primitives"
-msgstr "Nepodařilo se aktualizovat vybraná primitiva,"
-
-#. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
-msgid "Relation Editor: Remove Selected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Select primitives for selected relation members"
+msgstr "Smazat vybrané relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
-msgstr ""
+msgstr "Seřadit členy relace"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "Přesunout zvolené prvky nahoru"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
-msgstr "Přesunout zvolenou vrstvu o řádek dolů."
+msgstr "Přesunout zvolené členy dolů"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Odebere všechny označené objekty z relace"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "Smazat vybrané relace"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr "Pokračovat v řešení"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5119,10 +5036,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "Konflikty v datech"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -5131,21 +5047,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Uložit aktuální data."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5155,37 +5070,37 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Stáhnout všechny nekompletní cesty a uzly v relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "Stáhnout prvky"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5195,32 +5110,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
-msgstr "Ano, vyčistit to"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
-msgstr "Potvrdit akci dálkového ovládání"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Oddálit"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "Přesunout zvolenou vrstvu o řádek dolů."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5281,7 +5188,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "Nahrát výběr"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -5316,7 +5222,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "Změnit umístění"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6451,5 +6356,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Obrázky s GPS souřadnicemi"
@@ -6475,5 +6380,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6493,5 +6398,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG obrázky (*.jpg)"
@@ -6529,43 +6434,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "gps bod"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Přizpůsobit kreslení linií"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Použít globální nastavení."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Kreslit spojnice mezi body v této vrstvě"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Nereslit spojnice mezi body v této vrstvě"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Přizpůsobit barvu"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6573,6 +6478,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6649,10 +6554,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Převést do datové vrstvy"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6663,11 +6568,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6676,29 +6581,29 @@
 msgstr "Převedeno z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 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:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "Stáhnout vše v rozmezí:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metrů"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "Maximální plocha na požadavek:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} čtverečních km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6709,9 +6614,9 @@
 "pokračovat?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 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:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6719,5 +6624,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6769,5 +6674,5 @@
 msgstr "Převédst do GPX vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6793,5 +6698,5 @@
 msgstr[2] "trasy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6800,5 +6705,5 @@
 msgstr[2] "body"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6808,5 +6713,5 @@
 msgstr[2] "trasy s {0} body"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6816,5 +6721,5 @@
 msgstr[2] "{0} se skládá z {1} tras"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6824,9 +6729,9 @@
 msgstr[2] "{0} bodů"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "gps značka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6835,5 +6740,5 @@
 msgstr[2] "značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6843,14 +6748,14 @@
 msgstr[2] "{0} se skládá z  {1} značek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "Synchronizovat audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 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:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6858,14 +6763,14 @@
 msgstr "Zvuk zesynchronizován na bodu {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 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:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6873,13 +6778,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Zobrazit/Skrýt Text/Ikony"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Přepnout viditelnost textu značek a ikon."
@@ -7490,7 +7395,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
-#, fuzzy
 msgid "JOSM Plugin description URL"
-msgstr "Popis symbolu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
@@ -7887,7 +7791,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -7960,4 +7864,9 @@
 msgstr "Připravuji data..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "Nemůžu číst \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -7969,7 +7878,69 @@
 msgstr "Nemůžu číst \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Poznámka: GPL není kompatibilní s licencí OSM.  Nestahujte prosím cesti "
+"licencované pod GPL."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "GPX soubory"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "popis gps trasy"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Přidat informace autora"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Skutečné jméno"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr "Email"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Copyright (URL)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Předdefinováno"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "Copyright"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Klíčová slova"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Nastavení Exportu"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "Exportovat a uložit"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Chyba při exportu {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Zvolte předdefinovanou licenci"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -7997,4 +7968,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Chyba parsování: Chybná struktura GPX dokumentu"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Neznámá role ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8130,7 +8106,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "Prohledávám adresář {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8145,4 +8121,5 @@
 msgstr "Server odpověděl chybou s kódem {0}"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8174,4 +8151,33 @@
 msgstr "Přihlásit se"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "Soubory z OSM serveru"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+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>"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+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>"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr "Nemohu zálohovat soubor. Vyjímka: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8235,30 +8241,26 @@
 msgstr "Chyba během parsování"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "Soubory z OSM serveru"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Neznámá verze"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr "V OSM datech chybí číslo verze"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr "Neznámá verze: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr "Nalezen element <nd> mimo cestu."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "<nd> má nulový ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "Nalezen <member> tag mimo relaci."
@@ -8309,5 +8311,5 @@
 msgstr "Chybí povinný atribut \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8316,9 +8318,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "Neznámý typ prvku pro ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "Připravuji OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "Neplatné id uzlu"
@@ -8444,9 +8451,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "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ý."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8537,7 +8542,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "Nenalezeny informace o pluginu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8924,23 +8928,23 @@
 msgstr "Nalezen nulový soubor v adresáři {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Chyba při získávání souborů z adresáře {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr "Korelovat vůči GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "Bylo nalezeno {0} fotografií s GPS tagem."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "Otevřít obrázky s AgPifoJ..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9188,5 +9192,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Chyba při nahrávání souboru"
@@ -9235,30 +9239,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr "Katastr"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr "Automatické zdrojování"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr "Neplatná projekce"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr "Nejprve změňte projekci na {0}."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-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"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9267,9 +9254,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
@@ -9435,13 +9422,23 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr "Stáhnout obráze z Francouzkého katastrálního WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Katastr: {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+#, fuzzy
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
+msgstr ""
+"Pro použití katastrálního WMS pluginu, změňte projekci na Lambertovu a "
+"restartujte JOSM"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9511,5 +9508,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr "Upravit WMS"
@@ -10240,22 +10237,27 @@
 msgstr "Nemohu získat obrázek"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr "Navazuji spojení"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr "Připojeno"
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr "Nepřipojeno"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr "Připojení selhalo"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "jméno"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10288,32 +10290,32 @@
 msgstr "LiveGPS vrstva"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
 msgstr "Nahrát GPS záznam"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr "Spoj se s gpsd serverem a ukaž aktuální pozici v LiveGPS vrstvě."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center Once"
 msgstr "Vystředit jednou"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center the LiveGPS layer to current position."
 msgstr "Vystředit vrstvu LiveGPS na současnou pozici."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr "Automaticky vystředit"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Udržovat vrstvu LiveGPS vystředěnou na současné pozici."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -10563,24 +10565,24 @@
 msgstr "Povolené akce"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Dálkové ovládání bylo požádáno o nahrání dat z API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detaily požadavku: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr "Chcete toto povolit?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr "Potvrdit akci dálkového ovládání"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Dálkové ovládání bylo požádáno o import dat z následujícího URL:"
@@ -10822,10 +10824,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
+#, fuzzy, java-format
+msgid "{0} start"
 msgstr "start"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr "konec"
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} uzel"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11361,10 +11365,10 @@
 msgstr "Zkřížené cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr "Duplicitní uzly"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Tento test kontroluje, jestli dva body nejsou na přesně stejné pozici."
@@ -12053,9 +12057,32 @@
 msgstr "Neplatná URL WMS nebo id"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr "Upravit pozici zvolené WMS vrstvy"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "Zvolte řádek k editaci"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "Uložit WMS vrstvu"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+msgid "Start adjusting"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "Žádné změny k nahrání."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -12070,15 +12097,15 @@
 msgstr "Automatické stahování"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS vrstva ({0}), automatické stahování v přiblížení {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS vrstva ({0}), stahování v přiblížení {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12086,42 +12113,42 @@
 "Požadovaná plocha je příliš velká. Přibližte pohled nebo změňte rozlišení."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Nahrát viditelné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Změnit rozlišení"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Znovu nahrát chybné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Alfa kanál"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Uložit WMS vrstvu do souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr "Uložit WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "Nahrát WMS vrstvu ze souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr "Načíst vrstvu WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Nepodporovaná verze WMS souboru; nalezeno {0}, očekáváno {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Chyba formátu souboru"
@@ -12287,5 +12314,5 @@
 #: build/trans_plugins.java:23
 msgid "Visualizes routing information as a routing graph."
-msgstr ""
+msgstr "Vizualizuje informace o směrování v podobě grafu."
 
 #. Plugin grid
@@ -12739,5 +12766,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -15294,5 +15321,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15594,5 +15621,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15695,5 +15722,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -20319,7 +20346,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "Silnice pro motorová vozidla"
+msgstr ""
 
 #. color tertiary
@@ -23498,5 +23524,5 @@
 msgstr "Vesnice/Město"
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23507,5 +23533,5 @@
 msgstr "Jednosměrka"
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23515,5 +23541,5 @@
 msgstr "Kostel"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23524,5 +23550,5 @@
 msgstr "Čerpací stanice"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23533,5 +23559,5 @@
 msgstr "Nakupování"
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23541,5 +23567,5 @@
 msgstr "WC"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23772,47 +23798,31 @@
 msgstr ""
 
-#~ 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 "Unknown file extension for file ''{0}''"
+#~ msgstr "Neznámá přípona souboru ''{0}''"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Neznámá přípona souboru."
+
+#~ msgid "An error occurred while saving. Error is: {0}"
+#~ msgstr "Došlo k chybě při ukládání. Chyba: {0}"
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
+#~ "<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
+#~ "html>"
 #~ msgstr ""
-#~ "Nenalezena aktuální data. Opravdu máte otevřenou nebo staženou datovou "
-#~ "vrstvu?"
-
-#~ msgid "No data"
-#~ msgstr "Žádná data"
-
-#~ msgid "Update failed"
-#~ msgstr "Aktualizace selhala"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Chybějící prvek"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Aplikovat částečná řešení"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Vrstvy: {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 ""
-#~ "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 "Validate"
-#~ msgstr "Ověřit"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Ověřit buď aktuální výběr, nebo kompletní data."
+#~ "<html>Došlo k chybě při obnovování zálohy souboru.<br>Chyba: <br>{0}</"
+#~ "html>"
+
+#~ msgid "Move"
+#~ msgstr "Přesunout"
+
+#~ msgid "Invalid projection"
+#~ msgstr "Neplatná projekce"
+
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Nejprve změňte projekci na {0}."
+
+#~ msgid "end"
+#~ msgstr "konec"
 
 #~ msgid "Email"
@@ -23983,7 +23993,20 @@
 #~ "Nenáhrávejte žádná data po zobrazení této hlášky!"
 
+#~ 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 "Really mark this issue as ''done''?"
 #~ msgstr "Opravdu označit tento problém jako \"hotový\"?"
 
+#~ msgid "Validate"
+#~ msgstr "Ověřit"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Ověřit buď aktuální výběr, nebo kompletní data."
+
 #~ msgid "Commit comment"
 #~ msgstr "Poslat komentář"
@@ -23991,4 +24014,7 @@
 #~ msgid "Open the OpenStreetBugs window and activate the automatic download"
 #~ msgstr "Otevře okno OpenStreetBugs a aktivuje automatické stahování"
+
+#~ msgid "Layers: {0}"
+#~ msgstr "Vrstvy: {0}"
 
 #~ msgid "Conflicts: {0}"
@@ -24028,7 +24054,4 @@
 #~ "{1}"
 
-#~ msgid "No intersections found. Nothing was changed."
-#~ msgstr "Nenalezen průsečík. Nic nebylo změněno."
-
 #~ msgid "sports"
 #~ msgstr "Sportovní potřeby"
@@ -24039,4 +24062,7 @@
 #~ msgid "Server does not support changesets"
 #~ msgstr "Server nepodporuje sady změn"
+
+#~ msgid "Remove the member in the current table row from this relation"
+#~ msgstr "Odstranit prvek v aktuálním řádku tabulky z relace"
 
 #~ msgid "Tagging preset sources"
@@ -24109,4 +24135,11 @@
 #~ "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 "The projection could not be read from preferences. Using EPSG:4326"
@@ -24173,4 +24206,22 @@
 #~ msgstr "Obrázek s umístěný v {0} neexistuje nebo není čitelný."
 
+#~ msgid "Update failed"
+#~ msgstr "Aktualizace selhala"
+
 #~ msgid "Selection too big"
 #~ msgstr "Výběr je příliš velký"
+
+#~ 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 "No data"
+#~ msgstr "Žádná data"
+
+#~ msgid "Missing primitive"
+#~ msgstr "Chybějící prvek"
+
+#~ msgid "Apply partial resolutions"
+#~ msgstr "Aplikovat částečná řešení"
Index: /applications/editors/josm/i18n/po/da.po
===================================================================
--- /applications/editors/josm/i18n/po/da.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/da.po	(revision 16973)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-08-02 23:02+0000\n"
-"Last-Translator: Peter Brodersen <Unknown>\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-04 11:09+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,13 +16,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:35+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -47,15 +40,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -80,7 +65,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -88,4 +73,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -107,8 +96,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Fejl"
@@ -119,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Ugemte ændringer"
@@ -137,16 +128,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -158,13 +148,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -181,4 +172,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "Fortryd"
@@ -192,5 +184,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -199,5 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -208,23 +201,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -245,5 +238,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Advarsel"
@@ -277,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -308,5 +301,5 @@
 msgstr "Fejlrapporter"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -367,19 +360,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Vælg venligst rækken, der skal slettes"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Vælg enten:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "Foren punkter"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -418,5 +408,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -449,18 +439,18 @@
 msgstr "Længdegrad"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Opstil punkter i cirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Flyt de valgte punkter ind i en cirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -489,18 +479,18 @@
 msgstr "Værktøj: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Vælg mindst fire punkter."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -513,5 +503,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -636,13 +626,13 @@
 msgstr "Sammensæt adskillige veje til én"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Vælg mindst to veje at sammensætte."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "Sammensæt veje med forskellige tilhørsforhold?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -652,13 +642,13 @@
 "sammensætte dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "Sammensæt alligevel"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Skift retninger?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -668,9 +658,9 @@
 "nogle af dem om?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Vend om og sammensæt"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -679,5 +669,5 @@
 msgstr "Indtast værdier for alle konflikter."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -685,14 +675,14 @@
 msgstr "Løs konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Sammensæt {0} veje"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "Alle vejene var tomme"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -711,24 +701,23 @@
 msgstr "Kopier valgte objekter til udklipsholderen."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Vælg venligst noget at kopiere."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Opret cirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Opret cirkel ud fra tre valgte punkter."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "De punkter ligger ikke i en cirkel."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -740,8 +729,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -761,15 +750,15 @@
 msgstr "Slet valgte objekter."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Overskriv"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "Filen findes allerede. Overskriv?"
@@ -830,5 +819,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -838,7 +827,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "Fejl ved download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -849,5 +837,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Duplikér"
@@ -871,92 +860,36 @@
 msgstr "Afslut programmet."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Bemærk: GPL er ikke kompatibel med OSM-licensen. Upload ikke spor tilhørende "
-"GPL-licensen."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Eksporter til GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Eksporter dataet til GPS-fil."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Intet at eksportere. Hent først noget data."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr "parameter \"{0}\" må ikke være null"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "beskrivelse af gps-spor"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Angiv forfatter"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Rigtige navn"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr "E-mail"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Ophavsret (URL)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Forudindstillet"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "År for ophavsret"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Nøgleord"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Eksporter indstillinger"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "Eksporter og gem"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Fejl ved eksport af {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Vælg en forudangivet licens"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "Eksporter dataet til GPS-fil."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -972,6 +905,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1044,5 +977,5 @@
 msgstr "Forbind et punkt til nærmeste stykke vej"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "Forbind punkt og linje"
@@ -1053,12 +986,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Sammenflet alligevel"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "Flet laget nedenunder sammen med det valgte lag."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1104,12 +1035,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "valgt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Opdaterer de valgte primitiver fra serveren"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1169,5 +1098,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "Ny"
@@ -1242,5 +1171,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
-#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1248,7 +1176,4 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 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?"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1262,5 +1187,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Sæt ind"
@@ -1272,5 +1197,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Indsæt tags"
@@ -1317,7 +1242,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Kunne ikke omdøbe filen \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1354,5 +1279,10 @@
 msgstr "Filen {0} eksisterer allerede. Overskriv?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "Intet dokument er åbent, så der er intet at gemme."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1362,25 +1292,25 @@
 "venligst dette som en fejl."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "Intet dokument er åbent, så der er intet at gemme."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Tomt dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "Dette dokument indeholder intet data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "Gem alligevel"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1390,57 +1320,19 @@
 "håndteret som om, du afviste dem alle. Fortsæt?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "Afvis konflikter og gem"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "Gem OSM-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "Gem GPX-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "Gem lag"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Kunne ikke lave backup af fil."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Ukendt filtype: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr "En fejl opstod under skrivning."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr "En fejl opstod ved gendannelse af backup-fil."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Ukendt filtype."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "En fejl opstod under skrivning."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr "En fejl opstod ved gendannelse af backup-fil."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1551,5 +1443,5 @@
 "vejen.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1557,5 +1449,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1563,5 +1455,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1698,12 +1590,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
-#, fuzzy
 msgid "No current dataset found"
-msgstr "Intet GPX-datalag blev fundet"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
-#, fuzzy
 msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr "Kunne ikke finde primitiven med id {0} i det nuværende datasæt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
@@ -1812,7 +1702,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "Send alle ændringer til OSM-serveren."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1970,12 +1859,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "Sender data"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr "Følgende fejl opstod under masse-download:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -2015,5 +1903,5 @@
 msgstr "Tilstand: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2023,6 +1911,6 @@
 "når en vej slettes. Ctrl: Slet refererende objekter."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2033,8 +1921,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2079,38 +1967,38 @@
 msgstr "valgt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "Kan ikke tilføje et punkt uden for verdenen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Tilføj punkt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Tilføj punkt inde i vej"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "Forbind eksisterende vej til punkt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Tilføj et nyt punkt til en eksisterende vej"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "Tilføj punkt ind i vej og forbind"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "Opret nyt punkt."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "Vælg punkt under markøren."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2119,14 +2007,14 @@
 msgstr[1] "Indsæt nyt punkt i {0} veje."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "Start ny vej fra seneste punkt."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "Fortsæt vej fra seneste punkt."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "Afslut tegning."
@@ -2146,5 +2034,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Slip museknappen for at vælge objekterne inden i firkanten."
@@ -2155,5 +2043,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "Slip museknappen for at stoppe rotationen."
@@ -2188,9 +2076,9 @@
 msgstr[1] "Tilføj og flyt et virtuelt nyt punkt til {0} veje"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr "Flyt elementer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2200,13 +2088,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr "Flyt dem"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr "Fortryd flytning"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2215,5 +2103,5 @@
 "nærmeste punkt."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2435,26 +2323,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr "Mangler argumenter for \"eller\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr "Mangler argument fro \"ikke\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "Forventede slutparentes."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2463,5 +2351,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2551,8 +2439,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Løse konflikt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2564,10 +2451,10 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "Intet resultat for \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2611,5 +2498,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "Slet fra relation"
@@ -2624,5 +2511,5 @@
 "Slet fra relation?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr "Opdel vejstykke"
@@ -2630,5 +2517,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2640,8 +2528,7 @@
 "måske bruger dem.<br>Vil du virkelig slette?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "Slet fra relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2651,9 +2538,224 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Flyt"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "Foren {0} punkter"
+msgstr[1] "Foren {0} punkter"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr "Fjerner 1 primitiv"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "{0} punkt"
+msgstr[1] "{0} punkter"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Sekvens"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "Løs {0} tag-konflikter i {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr "Gendan {0} primitiver"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr "Løs versionskonflikter for {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr "Løs konflikter i punktlisten for vejen {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Udfør?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"Når denne vej bliver vendt om, vil følgende af vejens og punkternes "
+"egenskaber foreslås ændret for at opretholde data-ensartethed."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Relation"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Gammel rolle"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "Ny rolle"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Gammel nøgle"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Gammel værdi"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Ny nøgle"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "Ny værdi"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Udfør valgte ændringer"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Undlad at udføre ændringer"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "Vælg hvilke ændringer af egenskaber som du vil gennemføre."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Egenskaber for "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Automatisk tag-rettelse"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Fejl i konfigurationsfilen ved linjerne {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Kan ikke åbne mappen for indstillinger: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+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}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Indstillinger er gemt på {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Kunne ikke sende indstillinger. Årsag: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "Kunne ikke hente indstillinger fra serveren."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "decimalgrader"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "Grader minutter sekunder"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "V"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "Ø"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "rettesæt"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "ufuldstændig"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2667,211 +2769,4 @@
 msgstr[1] "noder"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr "Fjerner 1 primitiv"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Sekvens"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "Løs {0} tag-konflikter i {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr "Gendan {0} primitiver"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "Løs versionskonflikter for {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr "Løs konflikter i punktlisten for vejen {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Udfør?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"Når denne vej bliver vendt om, vil følgende af vejens og punkternes "
-"egenskaber foreslås ændret for at opretholde data-ensartethed."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "Relation"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "Gammel rolle"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "Ny rolle"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Gammel nøgle"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Gammel værdi"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Ny nøgle"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "Ny værdi"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "Udfør valgte ændringer"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "Undlad at udføre ændringer"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "Vælg hvilke ændringer af egenskaber som du vil gennemføre."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "Egenskaber for "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "Automatisk tag-rettelse"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Fejl i konfigurationsfilen ved linjerne {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Kan ikke åbne mappen for indstillinger: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-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}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Indstillinger er gemt på {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Kunne ikke sende indstillinger. Årsag: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "Kunne ikke hente indstillinger fra serveren."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "decimalgrader"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "Grader minutter sekunder"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "V"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "Ø"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "ufuldstændig"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2903,5 +2798,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2934,5 +2829,5 @@
 msgstr "parameteren \"{0}\" er ikke en acceptabel klasse, modtog \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -2941,22 +2836,22 @@
 msgstr[1] "{0} medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "landevej"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "jernbane"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "vandvej"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "brug af jord"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -3021,10 +2916,12 @@
 msgstr "multipolygon-vej \"{0}\" er ikke lukket."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "Tomt medlem i relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3032,5 +2929,5 @@
 msgstr "Slettede medlem \"{0}\" i relation"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3038,57 +2935,57 @@
 msgstr "Vej \"{0}\" med mindre end to punkter."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr "Mere end én \"fra\"-vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr "Mere end én \"til\"-vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr "Mere end én \"via\" blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Ukendt rolle \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Ukendt medlemstype for \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr "Ingen \"fra\"-vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr "Ingen \"til\"-vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr "Intet \"via\"-punkt eller vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "\"Fra\"-vejen begynder eller slutter ikke ved et \"via\"-punkt."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "\"Til\"-vejen begynder eller slutter ikke ved et \"via\"-punkt."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "\"Fra\"-vejen begynder eller slutter ikke ved \"via\"-vejen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "\"Til\"-vejen begynder eller slutter ikke ved \"via\"-vejen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3140,5 +3037,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3172,4 +3069,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3204,13 +3105,25 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "Kunne ikke læse bogmærker."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "Kunne ikke gemme bogmærke."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3245,4 +3158,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3274,15 +3188,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "Uventet handling"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
 msgstr ""
-"Kunne ikke forbinde til osm server. Tjek venligst din internetforbindelse."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3291,5 +3203,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -3297,6 +3209,4 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-"Kunne ikke oprette forbindelse til OSM-serveren {0}.\n"
-"Tjek server-URL'en i dine indstillinger samt din internetforbindelse."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
@@ -3512,6 +3422,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3540,39 +3450,39 @@
 msgstr "Lyd"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "Flyt til højre"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Kort: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "Flyt til venstre"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Flyt op"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Flyt ned"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "Zoom ind"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Zoom ud"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "skalér"
@@ -3606,10 +3516,10 @@
 msgstr "(intet objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "lag er ikke i listen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3692,12 +3602,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3706,6 +3616,6 @@
 msgstr "Tags"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3713,47 +3623,47 @@
 msgstr "Punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Tags ({0} konflikter)"
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#, java-format
+msgid "{0} pending tag conflicts to be resolved"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
-#, java-format
-msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
 msgid "Nodes(resolved)"
 msgstr "Punkter (afklaret)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Punkter (med konflikter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Medlemmer (afklaret)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3761,25 +3671,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Medlemmer (med konflikter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Egenskaber (med konflikter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
@@ -3979,8 +3889,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4201,5 +4111,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4212,5 +4122,5 @@
 msgstr "Primitiv"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4245,6 +4155,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4257,6 +4167,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4327,7 +4237,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4392,7 +4302,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Fortsæt alligevel"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4419,7 +4328,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Løs versionskonflikter for {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4468,99 +4377,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Åbn en liste af alle hentede lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Slet det valgte lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "Der er ugemte ændringer. Skal laget alligevel slettes?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "Slet lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "Vil du virkelig slette hele laget?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Oplysninger"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "ja"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Fjern"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "Slet {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Vis/skjul"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Skift synligheden for det valgte lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "privat"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "Slet det valgte lag."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "Flet laget nedenunder sammen med det valgte lag."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Flyt det valgte lag en række op."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Flyt det valgte lag en række ned."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "Mere information om denne feature"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4569,22 +4471,22 @@
 msgstr[1] "Dette vil ændre på op til {0} objekter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "En tom værdi vil slette nøglen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<forskellige>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Ret værdier?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4592,5 +4494,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4599,49 +4501,40 @@
 msgstr[1] "Ret egenskaber for op til {0} objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Vælg venligst en nøgle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Vælg venligst en værdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 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/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "Egenskaber/medlemsskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Egenskaber for valgte objekter."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "Medlem af"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "Skift relation"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "Slet virkelig det valgte fra relation {0}?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "Tilføj egenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4658,63 +4551,77 @@
 msgstr "Tilføj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 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/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "Rediger egenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 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/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Egenskaber: {0} / Medlemskaber: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "Egenskaber / Medlemskaber"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "Skift relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "Slet virkelig det valgte fra relation {0}?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "Fjern den valgte nøgle i alle objekter"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "Fjern egenskaber"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "Fjern den valgte nøgle i alle objekter"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Egenskaber: {0} / Medlemskaber: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "Egenskaber / Medlemskaber"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "Åbn en liste over alle relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relationer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Åbn en editor for den valgte relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Slet de nvalgte relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Opret en ny relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4745,5 +4652,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4811,5 +4718,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -4820,21 +4727,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "Hent område"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "Slet de nvalgte relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Hent synlige tern"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr ""
@@ -4853,17 +4757,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "Relationer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "Henter udvidelsen {0}..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -4881,7 +4784,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "Relationer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -4892,9 +4794,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -4903,15 +4805,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "Fjernede element fra relationer"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -4921,9 +4822,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -4933,15 +4834,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -4949,5 +4850,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -4955,66 +4856,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
+msgid "Remove all members referring to one of the selected primitives"
+msgstr ""
+
+#. putValue(NAME, tr("Remove Selected"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Relation Editor: Remove Selected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #, fuzzy
-msgid "Remove all members referring to one of the selected primitives"
-msgstr "Kunne ikke opdatere de valgte primitiver."
-
-#. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
-msgid "Relation Editor: Remove Selected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Select primitives for selected relation members"
+msgstr "Slet de nvalgte relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "Flyt det nuværende valgte medlem op"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "Flyt det nuværende valgte medlem ned"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Fjern alle valgte objekter fra relation"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "Slet de nvalgte relation"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr "Ikke forbundet"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5023,10 +4938,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "Konflikt i data"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -5035,21 +4949,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Gem nuværende data."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5059,37 +4972,37 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Hent alle ufuldstændige veje og punkter der er forbundet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "Hent medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5099,31 +5012,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
-msgstr "Bekræft Fjernbetjenings-handling"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Zoom ud"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "Flyt det nuværende valgte medlem ned"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5184,7 +5090,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "Hent valgte"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -5218,7 +5123,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "Skift lokalitet"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6352,5 +6256,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Geotaggede billeder"
@@ -6376,5 +6280,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6393,5 +6297,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG-billeder (*.jpg)"
@@ -6429,43 +6333,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "gps-punkt"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Tilpas linjetegning"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Brug globale indstillinger."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Tegn linjer mellem punkter for dette lag."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Tegn ikke linjer mellem punkter for dette lag."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Vælg linjetegnings-indstillinger"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Tilpas farve"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6473,6 +6377,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6546,10 +6450,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Konvertér til datalag"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6560,11 +6464,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6573,29 +6477,29 @@
 msgstr "Konverteret fra: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr "Hent fra OSM langs dette spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "Hent alt inden for:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6606,10 +6510,10 @@
 "du<br>at fortsætte?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 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:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6617,5 +6521,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6665,5 +6569,5 @@
 msgstr "Konvertér til GPX-lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6688,5 +6592,5 @@
 msgstr[1] "spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6694,5 +6598,5 @@
 msgstr[1] "punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6701,5 +6605,5 @@
 msgstr[1] "et spor med {0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6708,5 +6612,5 @@
 msgstr[1] "{0} består af {1} spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6715,9 +6619,9 @@
 msgstr[1] "{0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "GPS-markør"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6725,5 +6629,5 @@
 msgstr[1] "markører"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6732,9 +6636,9 @@
 msgstr[1] "{0} består af {1} markører"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "Synkronisér lyd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -6743,5 +6647,5 @@
 "angivelsen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6749,14 +6653,14 @@
 msgstr "Lyd synkroniseret på punkt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 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:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 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:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6764,13 +6668,13 @@
 msgstr "Du skal pause lyden på det punkt på sporet, hvor du vil have markøren."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 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:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Vis/skjul tekst/ikoner"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Skift synligheden for markør-tekst og -ikoner"
@@ -7384,7 +7288,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
-#, fuzzy
 msgid "JOSM Plugin description URL"
-msgstr "Tilføj JOSM-udvidelsers beskrivelses-URL."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
@@ -7787,7 +7690,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -7859,4 +7762,9 @@
 msgstr "Forbereder data..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "Kunne ikke læse \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -7868,7 +7776,69 @@
 msgstr "Kunne ikke læse \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Bemærk: GPL er ikke kompatibel med OSM-licensen. Upload ikke spor tilhørende "
+"GPL-licensen."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "GPX-filer"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "beskrivelse af gps-spor"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Angiv forfatter"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Rigtige navn"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr "E-mail"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Ophavsret (URL)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Forudindstillet"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "År for ophavsret"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Nøgleord"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Eksporter indstillinger"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "Eksporter og gem"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Fejl ved eksport af {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Vælg en forudangivet licens"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -7896,4 +7866,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Fejl ved fortolkning: ulovlig datastruktur for gpx-dokument"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Ukendt rolle \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8026,7 +8001,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "Tjekker mappen {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8041,4 +8016,5 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8070,4 +8046,32 @@
 msgstr "Login"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "OSM-serverfiler"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8125,30 +8129,26 @@
 msgstr "Fejl ved fortolkning"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "OSM-serverfiler"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Ukendt version"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr "Versionsnummer mangler fra OSM-data."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr "Ukendt version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr "Fandt <nd>-element i en ikke-vej"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "<nd> har nul ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "Fandt <member>-element i en ikke-relation."
@@ -8198,5 +8198,5 @@
 msgstr "Mangler obligatorisk attribut \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8205,9 +8205,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "Ukendt medlemstype for \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "Forbereder OSM-data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "Defekt id for punkt"
@@ -8331,9 +8336,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "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."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8424,7 +8427,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "Ingen udvidelsesinformationer blev fundet."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8813,23 +8815,23 @@
 msgstr "Fandt en null-fil i mappen {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Fejl ved hentning af filer fra mappen {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr "Sammenhold med GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} blev fundet, som skal gps-tagges"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "Åbn billeder med AgPifoJ..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9078,5 +9080,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Fejl ved indlæsning af fil"
@@ -9125,30 +9127,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr "Ugyldig projicering"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr "Skift først projiceringen til {0}."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-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"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9157,9 +9142,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
@@ -9322,13 +9307,23 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
 msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+#, fuzzy
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
+msgstr ""
+"Hvis du vil aktivere Cadastre-WMS-udvidelsen, så ret\n"
+"JOSM-projiceringen til Lambert og genstart"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9395,5 +9390,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr "Tilpas WMS"
@@ -10104,22 +10099,27 @@
 msgstr "Kunne ikke hente billede"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr "Forbinder"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr "Forbundet"
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr "Ikke forbundet"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr "Forbindelsen mislykkedes"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "navn"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10152,32 +10152,32 @@
 msgstr "LiveGPS-lag"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr "Forbind til gpsd-server og vis nuværende position i LiveGPS-lag"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center Once"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center the LiveGPS layer to current position."
 msgstr "Centrér LiveGPS-laget til nuværende position."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr "Auto-centrér"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Centrér LiveGPS-laget løbende til den nuværende position."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -10417,24 +10417,24 @@
 msgstr "Tilladte handlinger"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr "Anmod om detaljer: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr "Vil du tillade dette?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr "Bekræft Fjernbetjenings-handling"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -10673,10 +10673,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
+#, fuzzy, java-format
+msgid "{0} start"
 msgstr "start"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr "slut"
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} punkt"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11204,10 +11206,10 @@
 msgstr "Krydsende veje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr "Dublet-punkter"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
@@ -11876,9 +11878,32 @@
 msgstr "Ingen gyldig WMS-URL eller id"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr "Tilpas positionen for det valgte WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "Vælg venligst rækken, der skal rettes."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "Gem WMS-lag"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+msgid "Start adjusting"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "Ingen ændringer at sende."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11891,15 +11916,15 @@
 msgstr "Automatisk download"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-lag ({0}), henter automatisk til zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-lag ({0}), henter til zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -11908,42 +11933,42 @@
 "opløsningen."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Hent synlige tern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Skift opløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Genhent fejlagtige tern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Alpha-kanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Gem WMS-lag til fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr "Gem WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "Hent WMS-lag fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr "Hent WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Fil format fejl"
@@ -12542,5 +12567,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -15097,5 +15122,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15397,5 +15422,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15498,5 +15523,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -20122,7 +20147,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "motor"
+msgstr ""
 
 #. color tertiary
@@ -23301,5 +23325,5 @@
 msgstr "By"
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23310,5 +23334,5 @@
 msgstr "Ensrettet"
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23318,5 +23342,5 @@
 msgstr "Kirke"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23327,5 +23351,5 @@
 msgstr "Benzintank"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23336,5 +23360,5 @@
 msgstr "Forretninger"
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23344,5 +23368,5 @@
 msgstr "WC"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23575,31 +23599,18 @@
 msgstr ""
 
-#~ 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 ""
-#~ "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 "No data"
-#~ msgstr "Intet data"
-
-#~ msgid "Update failed"
-#~ msgstr "Opdateringen fejlede"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Mangler primitiv"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Lag: {0}"
-
-#~ 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 "Unknown file extension."
+#~ msgstr "Ukendt filtype."
+
+#~ msgid "Move"
+#~ msgstr "Flyt"
+
+#~ msgid "Invalid projection"
+#~ msgstr "Ugyldig projicering"
+
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Skift først projiceringen til {0}."
+
+#~ msgid "end"
+#~ msgstr "slut"
 
 #~ msgid ""
@@ -23610,10 +23621,4 @@
 #~ "fra, om problemet."
 
-#~ msgid "Validate"
-#~ msgstr "Validér"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Validér enten den nuværende selektion eller det fulde datasæt"
-
 #~ msgid ""
 #~ "Server returned internal error. Try a reduced area or retry after waiting "
@@ -23744,4 +23749,7 @@
 #~ 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 "Really mark this issue as ''done''?"
 #~ msgstr "Vil du virkelig markere denne fejlrapport som \"udført\"?"
@@ -23759,4 +23767,10 @@
 #~ msgid "Import TCX File..."
 #~ msgstr "Importér TCX-fil..."
+
+#~ msgid "Validate"
+#~ msgstr "Validér"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Validér enten den nuværende selektion eller det fulde datasæt"
 
 #~ msgid "Click Reload to refresh list"
@@ -23797,4 +23811,7 @@
 #~ msgid "image not loaded"
 #~ msgstr "billedet er ikke indlæst"
+
+#~ msgid "Layers: {0}"
+#~ msgstr "Lag: {0}"
 
 #~ msgid "Open the OpenStreetBugs window and activate the automatic download"
@@ -23937,4 +23954,11 @@
 #~ "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 "YAHOO (GNOME)"
 #~ msgstr "YAHOO (GNOME)"
@@ -23994,4 +24018,10 @@
 #~ msgstr "Slet mine"
 
+#~ msgid "Missing primitive"
+#~ msgstr "Mangler primitiv"
+
+#~ msgid "Update failed"
+#~ msgstr "Opdateringen fejlede"
+
 #~ msgid "Selection too big"
 #~ msgstr "Der er valgt for meget"
@@ -24005,2 +24035,11 @@
 #~ 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 "No data"
+#~ msgstr "Intet data"
Index: /applications/editors/josm/i18n/po/de.po
===================================================================
--- /applications/editors/josm/i18n/po/de.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/de.po	(revision 16973)
@@ -1,2 +1,3 @@
+# translation of de.po to Deutsch
 # translation of de.po to
 #
@@ -8,21 +9,14 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-07-27 20:35+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
-"Language-Team: <de@li.org>\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-10 14:06+0200\n"
+"Last-Translator: Dirk Stöcker <openstreetmap@dstoecker.de>\n"
+"Language-Team: Deutsch\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:35+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
+"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -49,15 +43,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -82,7 +68,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -90,4 +76,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -109,8 +99,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Fehler"
@@ -118,9 +110,8 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:399
 msgid "Hint: Some changes came from uploading new data to the server."
-msgstr ""
-"Hinweis: Einige Änderungen sind durch das Hochladen der Daten entstanden."
+msgstr "Hinweis: Einige Änderungen sind durch das Hochladen der Daten entstanden."
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Ungespeicherte Änderungen"
@@ -140,16 +131,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -161,13 +151,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -184,4 +175,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -195,5 +187,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -202,5 +194,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -211,23 +204,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -248,5 +241,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Warnung"
@@ -280,5 +273,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -311,5 +304,5 @@
 msgstr "Fehler melden"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -377,19 +370,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Bitte wählen Sie die zu löschende Zeile."
+msgstr "Bitte die Zielebene auswählen."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Bitte wählen:"
+msgstr "Zielebene auswählen"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "Knotenpunkte vereinigen"
+msgstr "Vereinen"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -402,5 +392,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 msgid "No target layers"
-msgstr ""
+msgstr "Keine Zielebenen"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
@@ -428,5 +418,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -459,18 +449,18 @@
 msgstr "Längengrad"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Knotenpunkte im Kreis anordnen"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Gewählte Punkte in einem Kreis anordnen."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -499,18 +489,18 @@
 msgstr "Werkzeug: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Bitte mindestens vier Knotenpunkte auswählen."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -523,5 +513,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -652,13 +642,13 @@
 msgstr "Mehrere Wege zu einem verbinden."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Bitte wählen Sie mindestens zwei Wege zum Verbinden."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "Wege mit unterschiedlicher Mitgliedschaft verbinden?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -668,13 +658,13 @@
 "wirklich verbunden werden?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "Trotzdem verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Richtungen ändern?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -684,9 +674,9 @@
 "Möchten Sie, dass einige Richtungen gedreht werden?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Drehen und Verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -695,5 +685,5 @@
 msgstr "Werte für alle Konflikte festlegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -701,14 +691,14 @@
 msgstr "Konflikte auflösen"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0} Wege verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "Alle Wege sind leer"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -727,24 +717,23 @@
 msgstr "Gewählte Objekte in die Zwischenablage kopieren."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Bitte etwas zum Kopieren auswählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Kreis erstellen"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Einen Kreis aus drei ausgewählten Knoten erstellen."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "Diese Knoten sind nicht in einem Kreis angeordnet."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr "Diese Knoten sind nicht in einem Kreis angeordnet. Abbruch."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -758,8 +747,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -779,15 +768,15 @@
 msgstr "Ausgewählte Objekte löschen."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "Datei existiert bereits. Überschreiben?"
@@ -848,5 +837,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -856,7 +845,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "Fehler beim Herunterladen"
+msgstr "Konflikte beim Herunterladen"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -867,5 +855,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Duplizieren"
@@ -889,93 +878,36 @@
 msgstr "Programm beenden"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Achtung: Die GPL ist nicht konform zur OSM-Lizenz. Keine GPS-Spuren, welche "
-"unter der GPL stehen, hochladen."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Als GPX exportieren..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Die Daten ins GPX-Format exportieren."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Nichts zu exportieren. Erzeugen Sie zuerst ein paar Daten."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr "Parameter ''{0}'' darf nicht null sein"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-msgstr ""
-"Erwartete eine Instanz von OsmDataLayer oder GpxLayer. Erhielt ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "Beschreibung der GPS-Spur"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Information zum Autor hinzufügen."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Voller Name"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Copyright (URL)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Vordefiniert"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "Jahr des Copyrights"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Schlüsselwörter"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Export-Einstellungen"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "Exportieren und Speichern"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Fehler beim Exportieren von {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Eine vordefinierte Lizenz auswählen"
+msgstr "Erwartete eine Instanz von OsmDataLayer oder GpxLayer. Erhielt ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "Die Daten ins GPX-Format exportieren."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -991,6 +923,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1063,5 +995,5 @@
 msgstr "Einen Knotenpunkt an der nächsten Stelle in den Weg einfügen."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "Knotenpunkt und Linie vereinigen"
@@ -1072,12 +1004,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Trotzdem vereinen"
+msgstr "Ebene vereinigen"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "Ebene direkt unterhalb in die gewählte Ebene integrieren."
+msgstr "Aktuelle Ebene mit einer anderen zusammenführen"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1123,12 +1053,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "Auswahl"
+msgstr "Auswahl vereinigen"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Aktualisiert die ausgewählten Objekt vom Server"
+msgstr "Führt die ausgewählte Primitive in eine andere Schicht"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1188,5 +1116,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "Neu"
@@ -1209,4 +1137,6 @@
 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>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
@@ -1254,14 +1184,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87
 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."
+msgstr "Bitte geschlossene(n) Weg(e) mit mindestens vier Knotenpunkten auswählen."
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109
 msgid "Please select ways with almost right angles to orthogonalize."
-msgstr ""
-"Bitte Wege mit nahezu rechten Winkeln zum rechtwinklig machen auswählen."
+msgstr "Bitte Wege mit nahezu rechten Winkeln zum rechtwinklig machen auswählen."
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
-#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1271,5 +1198,5 @@
 "<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?"
+"Projektion zum Ausschalten dieser Warnung.<br>Wollen Sie fortfahren?</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1283,5 +1210,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Einfügen"
@@ -1293,5 +1220,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Merkmale einfügen"
@@ -1338,7 +1265,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Kann die Datei \"{0}\" nicht umbenennen."
+msgstr "Die Datei ''{0}'' konnte nicht umbenannt werden"
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1375,5 +1302,10 @@
 msgstr "Datei {0} existiert bereits. Überschreiben?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "Keine Überschneidung gefunden. Es wurde nichts geändert."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1383,25 +1315,25 @@
 "no layer.\""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "Kein Dokument geöffnet, deshalb nichts zu speichern."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Leeres Dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "Das Dokument enthält keine Daten."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "Trotzdem speichern"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Konflikte"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1411,58 +1343,19 @@
 "Sollen alle Konflikte abgewiesen werden?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "Konflikte abweisen und speichern"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "OSM-Datei speichern"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "GPX-Datei speichern"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "Ebene speichern"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Sicherung der Datei konnte nicht erstellt werden."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Dateiendung unbekannt: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr ""
-"<html>Fehler bei der Kommunikation mit dem Server<br>Details: {0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr "Beim Wiederherstellen ist ein Fehler aufgetreten."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Dateiendung unbekannt."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "Beim Speichern ist ein Fehler aufgetreten."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr "Beim Wiederherstellen ist ein Fehler aufgetreten."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1497,6 +1390,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
 msgid "Show status report with useful information that can be attached to bugs"
-msgstr ""
-"Statusübersicht mit nützlichen Informationen für Fehlerberichte anzeigen"
+msgstr "Statusübersicht mit nützlichen Informationen für Fehlerberichte anzeigen"
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
@@ -1578,24 +1470,17 @@
 "in der Mitte des Weges.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
 "should verify this and correct it when necessary.</html>"
 msgstr ""
-"Eine rollenbasierte Relations-Mitgliedschaft wurde in alle neuen Wege "
-"kopiert.\n"
-"Sie sollten dies überprüfen und falls nötig korrigieren."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
-#, fuzzy
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
 "this and correct it when necessary.</html>"
 msgstr ""
-"Alle neuen Wege wurden Element in einer Relation gemacht.\n"
-"Bitte prüfen und korrigieren Sie dies falls notwendig."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1660,6 +1545,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
-msgid ""
-"* One way that has one or more nodes that are used by more than one way, or"
+msgid "* One way that has one or more nodes that are used by more than one way, or"
 msgstr ""
 "* Einen Weg, der einen oder mehr Knoten hat, die von mehr als einem Weg "
@@ -1667,6 +1551,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
-msgid ""
-"* One way and one or more of its nodes that are used by more than one way."
+msgid "* One way and one or more of its nodes that are used by more than one way."
 msgstr ""
 "* Einen Weg und einen oder mehr Knoten, die von mehr als einem Weg verwendet "
@@ -1735,16 +1618,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
 msgid "Updates the current data layer from the server (re-downloads data)"
-msgstr ""
-"Die aktuelle Datenebene mittels des Servers aktualisieren (neu herunterladen)"
+msgstr "Die aktuelle Datenebene mittels des Servers aktualisieren (neu herunterladen)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
-#, fuzzy
 msgid "No current dataset found"
-msgstr "Keine GPX-Datenebene gefunden."
+msgstr "Aktueller Datensatz wurde nicht gefunden"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
-#, fuzzy
 msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr "Konnte Objekt mit ID {0} im aktuellen Datensatz nicht finden"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
@@ -1851,6 +1731,5 @@
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-msgstr ""
-"Fehler-Kopfzeile \"{0}\" entspricht nicht dem erwarteten Muster \"{1}\""
+msgstr "Fehler-Kopfzeile \"{0}\" entspricht nicht dem erwarteten Muster \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380
@@ -1868,7 +1747,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "Alle Änderungen zum OSM-Server hochladen."
+msgstr "Alle Änderungen mit einer Anfrage hochladen"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -2007,9 +1885,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
-#, fuzzy, java-format
-msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-"Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}"
+#, java-format
+msgid "Ignoring exception because download has been cancelled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
@@ -2027,12 +1903,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
 msgstr "Daten aktualisieren"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr "Die folgenden Fehler sind während des Herunterladens aufgetreten:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -2078,5 +1953,5 @@
 msgstr "Modus: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2086,6 +1961,6 @@
 "Knotenpunkte nicht löschen. Strg: Lösche verweisende Objekte."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2096,8 +1971,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2142,38 +2017,38 @@
 msgstr "Ausgewählt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "Kann keinen Knoten außerhalb der Welt erstellen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Knotenpunkt hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Knotenpunkt in einen Weg einfügen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "Existierenden Weg mit Knotenpunkt verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Einen Knotenpunkt in einen bestehenden Weg einfügen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "Knotenpunkt in einen Weg einfügen und verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "Einen neuen Knoten erstellen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "Knoten unter Mauszeiger wählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2182,14 +2057,14 @@
 msgstr[1] "Neuen Knoten in {0} Wege einfügen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "Neuen Weg an letztem Knoten beginnen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "Weg am letzten Knoten fortsetzen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "Zeichnen beenden."
@@ -2209,5 +2084,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Maustaste loslassen, um Objekte im Rechteck auszuwählen."
@@ -2215,9 +2090,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
 msgid "Draw a rectangle of the desired size, then release the mouse button."
-msgstr ""
-"Ein Rechteck der gewünschten Größe zeichnen und dann den Mausknopf loslassen."
+msgstr "Ein Rechteck der gewünschten Größe zeichnen und dann den Mausknopf loslassen."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "Maustaste loslassen, um das Drehen zu stoppen."
@@ -2254,9 +2128,9 @@
 msgstr[1] "Virtuellen Knoten zu {0} Wegen hinzufügen und bewegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr "Elemente verschieben"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2269,20 +2143,19 @@
 "Wollen Sie sie wirklich verschieben?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr "Verschieben"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr "Verschieben rückgängig machen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
-msgid ""
-"Release the mouse button to stop moving. Ctrl to merge with nearest node."
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
+msgid "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 "Maustaste loslassen, um die Bewegung zu stoppen. Strg: mit dem nächsten "
 "Punkt vereinigen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2322,5 +2195,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
-msgstr ""
+msgstr "Es kann nicht gesucht werden, da keine Daten geladen sind."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66
@@ -2356,6 +2229,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
 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."
+msgstr "<b>\"Berliner Straße\"</b> - 'Berliner Straße' in einem Schlüssel oder Namen."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
@@ -2388,8 +2260,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
-msgid ""
-"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr ""
-"<b>type:</b> - Typ des Objektes (<b>node</b>, <b>way</b>, <b>relation</b>)"
+msgid "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
+msgstr "<b>type:</b> - Typ des Objektes (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
@@ -2422,6 +2292,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
+msgid "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 "<b>child <i>ausdr</i></b> - Alle untergeordneten Objekte des passenden "
@@ -2429,6 +2298,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
+msgid "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 "<b>parent <i>ausdr</i></b> - Alle übergeordneten Objekte des passenden "
@@ -2437,11 +2305,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-"Nutzung von <b>|</b> oder <b>OR</b> zum Kombinieren mittels logischem Oder."
+msgstr "Nutzung von <b>|</b> oder <b>OR</b> zum Kombinieren mittels logischem Oder."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 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)"
+msgstr "Nutzung von <b>\"</b> zum Zusammenfassen (z.B. falls ein Schlüssel : enthält)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
@@ -2503,6 +2369,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
-msgstr ""
-"Schlüssel kann bei Gleichheitsoperator nicht leer sein. Beispiel: feld=wert"
+msgstr "Schlüssel kann bei Gleichheitsoperator nicht leer sein. Beispiel: feld=wert"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215
@@ -2518,26 +2383,26 @@
 "\"relation\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Unerwartete Daten: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr "Fehlendes Argument für 'OR'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr "Fehlendes Argument für 'NICHT'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "Schließende Klammer erwartet."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Falsche Anzahl an Parametern für Knoten-Operator."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2548,5 +2413,5 @@
 "oder -bereich, z.B. \"nodes:1-20\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2636,23 +2501,22 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Konflikte lösen"
+msgstr "Doppelter Konflikt"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
 "primitmive ''{1}''"
-msgstr "Konflikt mit Element \"{0}\" besteht bereits"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "Nichts gefunden für Suche ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2698,5 +2562,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "Aus der Relation entfernen"
@@ -2711,5 +2575,5 @@
 "Aus Relation entfernen?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr "Wegabschnitt aufspalten"
@@ -2717,5 +2581,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2727,8 +2592,7 @@
 "diese verwenden.<br>Wollen Sie die Knoten wirklich löschen?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "Aus der Relation entfernen"
+msgstr "Löschbestätigung"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2738,9 +2602,227 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Verschieben"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "{0} Knotenpunkte vereinigen"
+msgstr[1] "{0} Knotenpunkte vereinigen"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr "1 Objekt entfernen"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr "Entferne Referenz aus Weg {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+"Warnung: Weg {0} wird gelöscht da die Anzahl der Knotenpunkte {1} ist. Es "
+"werden aber min. 2 Knotenpunkte benötigt."
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr "Entferne Referenz aus Relation {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr "Konflikte in der Elementenliste für Relation {0} auflösen"
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr "Relationselement {0} {1} entfernen"
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "{0} Knoten drehen"
+msgstr[1] "{1} Knoten drehen"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Abfolge"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "{0} Merkmalskonflikte für {1} {2} auflösen"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr "{0} Objekte wiederherstellen"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr "Versionskonflikt für {0} {1} auflösen"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr "Konflikte in Knotenliste des Weges {0} auflösen"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr "Hauptdatensatz enthält Knoten {0} nicht"
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Anwenden?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"Für das Umdrehen des Weges werden zum Erhalt der Datenintegrität folgende "
+"Eigenschaftsänderungen am Weg und seinen Knoten vorgeschlagen."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Relation"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Alter Rolle"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "Neue Rolle"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Alter Schlüssel"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Alter Wert"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Neuer Schlüssel"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "Neuer Wert"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Ausgewählte Änderungen anwenden"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Änderungen nicht anbringen"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "Bitte wählen Sie welche, Objekteigenschaften geändert werden sollen."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Eigenschaften von "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr "Rollen in Relationen beziehen sich auf"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Automatische Merkmalskorrektur"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Ungültige Einstellungen in den Zeilen {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Kann Einstellungsverzeichnis nicht laden: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr "Einstellungsdate enthält Fehler. Erstelle eine Sicherung unter {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Einstellungen auf {0} gespeichert"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Kann keine Einstellungen zum Server laden. Grund: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "Kann keine Einstellungen vom Server laden."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+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}"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr "Konflikt mit Element \"{0}\" besteht bereits"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "Dezimalgrad"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "Grad Minuten Sekunden"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "W"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "O"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, java-format
+msgid "Changeset {0}"
+msgstr "Änderungssatz {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr "Der Parameter \"{0}\" muss größer als 0 sein. Er ist aber \"{1}\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "unvollständig"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2754,212 +2836,4 @@
 msgstr[1] "Knotenpunkte"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr "1 Objekt entfernen"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr "Entferne Referenz aus Weg {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-"Warnung: Weg {0} wird gelöscht da die Anzahl der Knotenpunkte {1} ist. Es "
-"werden aber min. 2 Knotenpunkte benötigt."
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr "Entferne Referenz aus Relation {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr "Konflikte in der Elementenliste für Relation {0} auflösen"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr "Relationselement {0} {1} entfernen"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr "Drehen {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Abfolge"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "{0} Merkmalskonflikte für {1} {2} auflösen"
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr "{0} Objekte wiederherstellen"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "Versionskonflikt für {0} {1} auflösen"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr "Konflikte in Knotenliste des Weges {0} auflösen"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr "Hauptdatensatz enthält Knoten {0} nicht"
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Anwenden?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"Für das Umdrehen des Weges werden zum Erhalt der Datenintegrität folgende "
-"Eigenschaftsänderungen am Weg und seinen Knoten vorgeschlagen."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "Relation"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "Alter Rolle"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "Neue Rolle"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Alter Schlüssel"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Alter Wert"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Neuer Schlüssel"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "Neuer Wert"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "Ausgewählte Änderungen anwenden"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "Änderungen nicht anbringen"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "Bitte wählen Sie welche, Objekteigenschaften geändert werden sollen."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "Eigenschaften von "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr "Rollen in Relationen beziehen sich auf"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "Automatische Merkmalskorrektur"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Ungültige Einstellungen in den Zeilen {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Kann Einstellungsverzeichnis nicht laden: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr "Einstellungsdate enthält Fehler. Erstelle eine Sicherung unter {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Einstellungen auf {0} gespeichert"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Kann keine Einstellungen zum Server laden. Grund: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "Kann keine Einstellungen vom Server laden."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr "Konflikt mit Element \"{0}\" besteht bereits"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "Dezimalgrad"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "Grad Minuten Sekunden"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "W"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "O"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "Der Parameter \"{0}\" muss größer als 0 sein. Er ist aber \"{1}\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "unvollständig"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2991,5 +2865,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -3022,8 +2896,7 @@
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
-msgstr ""
-"Als Parameter \"{0}\" wurde \"{1}\" übergeben. Das ist keine gültige Klasse."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+msgstr "Als Parameter \"{0}\" wurde \"{1}\" übergeben. Das ist keine gültige Klasse."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -3032,22 +2905,22 @@
 msgstr[1] "{0} Elemente"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "Straße"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "Eisenbahn"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "Gewässer"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "Landfläche"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -3069,6 +2942,5 @@
 #, java-format
 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}\"."
+msgstr "Der Parameter \"{0}\" muss im Bereich 0 bis {1} sein. Er ist aber \"{2}\"."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179
@@ -3115,10 +2987,12 @@
 msgstr "Multipolygon-Weg ''{0}''  ist nicht geschlossen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "Leeres Element in der Relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3126,5 +3000,5 @@
 msgstr "Gelöschtes Element ''{0}'' in der Relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3132,57 +3006,57 @@
 msgstr "Weg ''{0}'' mit weniger als zwei Knoten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr "Mehr als ein Weg mit \"from\" gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr "Mehr als ein Weg mit \"to\" gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr "Mehr als ein Element mit \"via\" gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Unbekannte Role \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Unbekannter Elementtyp für \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr "Kein \"from\"-Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr "Kein \"to\"-Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr "Kein \"via\"-Knoten oder Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3234,5 +3108,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3269,4 +3143,8 @@
 msgid "WGS84 Geographic"
 msgstr "WGS84 Geografisch"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111
@@ -3305,13 +3183,25 @@
 msgstr "UTM Zone {0}"
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "Lesezeichen konnten nicht gelesen werden."
+msgstr "<html>Die Lesezeichen konnten nicht gelesen werden.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "Lesezeichen konnten nicht geschrieben werden."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3349,4 +3239,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3378,23 +3269,20 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "Unerwarteter Fehler"
+msgstr "Sicherheitsausnahme"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
 msgstr ""
-"Verbindung zum OSM-Server fehlgeschlagen. Bitte prüfen sie ihre "
-"Internetverbindung."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "Network exception"
-msgstr ""
+msgstr "Netzwerkausnahme"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -3402,11 +3290,8 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-"Aufbau der Verbindung zum OSM-Server {0} ist fehlgeschlagen.\n"
-"Prüfen Sie die Server-URL in Ihren Einstellungen und Ihre Internetverbindung."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
-#, fuzzy
 msgid "Unknown host"
-msgstr "Unbekanntes Aufzeichnungsformat"
+msgstr "Rechner unbekannt"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
@@ -3426,8 +3311,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: failed to bring extended dialog always on top. Exception: {0}"
 msgstr ""
-"Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65
@@ -3626,6 +3510,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3654,39 +3538,39 @@
 msgstr "Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "Nach rechts verschieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Karte: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "Nach links verschieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Nach oben verschieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Nach unten verschieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "Hineinzoomen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Herauszoomen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "Skala"
@@ -3720,10 +3604,10 @@
 msgstr "(kein Objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "Ebene nicht in der Liste."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3732,6 +3616,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
 #, java-format
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgid "Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
 
@@ -3766,6 +3649,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:96
-msgid ""
-"partial: different selected objects have different values, do not change"
+msgid "partial: different selected objects have different values, do not change"
 msgstr ""
 "teilweise: verschiedene gewählte Objekte haben verschiedene Werte, nicht "
@@ -3807,12 +3689,12 @@
 msgstr "Role {0} nimmt nicht an dem Vergleichspaar {1} teil."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3821,6 +3703,6 @@
 msgstr "Merkmale"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3828,49 +3710,48 @@
 msgstr "Knoten"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Elemente"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "Keine verbleibenden Merkmalskonflikte zu beheben"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Merkmale({0} Konflikte)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} verbleibende Merkmalskonflikte zu beheben"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Knoten(gelöst)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+msgid "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 "Vereinigte Knotenliste fixiert. Keine verbleibenden Konflikte in der "
 "Knotenliste des Weges."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Knoten(mit Konflikten)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "Verbleibende Konflikte in der Knotenliste des Weges"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Elemente(gelöst)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3880,25 +3761,25 @@
 "Elementenliste der Relation."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Elemente(mit Konflikten)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Verbleibende Konflikte in der Elementenliste der Relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr "Keine verbleibenden Eigenschaftskonflikte"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Eigenschaften(mit Konflikten)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr "Verbleibende Eigenschaftskonflikte zu beheben"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Konfliktlösung"
@@ -3972,6 +3853,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
-msgstr ""
-"Kopiere meine gewählten Knoten an den Anfang der Liste vereinigter Knoten."
+msgstr "Kopiere meine gewählten Knoten an den Anfang der Liste vereinigter Knoten."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
@@ -3981,6 +3861,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
 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."
+msgstr "Kopiere meine gewählten Elemente an das Ende der Liste vereinigter Elemente."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
@@ -4008,6 +3887,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
 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."
+msgstr "Kopiere deren gewählte Elemente an das Ende der Liste vereinigter Elemente."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
@@ -4052,6 +3930,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
 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."
+msgstr "Lösche die ausgewählten Einträge aus der Liste der vereinigten Elemente."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
@@ -4075,6 +3952,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
 #, java-format
-msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</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>"
 
@@ -4084,6 +3960,5 @@
 "<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>"
+msgstr "<html>Wähle <strong>{0}</strong> um das Vereinigen abzuschließen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
@@ -4115,8 +3990,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4169,6 +4044,5 @@
 "<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>"
+msgstr "<html>Fehler bei der Kommunikation mit dem Server<br>Details: {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
@@ -4353,5 +4227,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4364,5 +4238,5 @@
 msgstr "Objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4399,6 +4273,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4411,6 +4285,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4481,7 +4355,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4521,6 +4395,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
-msgid ""
-"Set the selected elements on the map to the selected items in the list above."
+msgid "Set the selected elements on the map to the selected items in the list above."
 msgstr ""
 "Ausgewählte Elemente auf der Karte auf die obige Liste der ausgewählten "
@@ -4546,7 +4419,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Trotzdem fortfahren"
+msgstr "Trotzdem schließen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4555,5 +4427,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>You didn''t finish to merge the differences in this conflict."
@@ -4563,12 +4435,8 @@
 "<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210
 msgid "Conflict not resolved completely"
-msgstr ""
+msgstr "Konflikt konnte nicht vollständig gelöst werden."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:246
@@ -4577,7 +4445,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Versionskonflikt für {0} {1} auflösen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4628,99 +4496,92 @@
 msgstr "History der markierten Elemente anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Ebenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Liste aller geladenen Ebenen öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Ausgewählte Ebene löschen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "Änderungen sind nicht gespeichert. Ebene trotzdem löschen?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "Ebene löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "Soll wirklich die gesamte Ebene gelöscht werden?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr "Wollen Sie die Ebene ''{0}'' wirklich löschen?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Information"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr "Bestätigung"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "ja"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr "Ja"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr "Nein"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Entfernen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr "Alle löschen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "{0} {1} löschen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr "Lösche Ebene {0} von {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Anzeigen/Ausblenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Sichtbarkeit der Ebene umschalten."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "Privat"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr "Aktivieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "Ausgewählte Ebene löschen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr "Die ausgewählte Ebene aktivieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "Ebene direkt unterhalb in die gewählte Ebene integrieren."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr "Aktuelle Eben mit einer anderen Ebene verbinden"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Gewählte Ebene eine Zeile nach oben verschieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Gewählte Ebene eine Zeile nach unten verschieben."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "Informationstafel"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr "Ebeneninformation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4729,28 +4590,27 @@
 msgstr[1] "Damit werden maximal {0} Objekte geändert."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "Ein leerer Wert löscht den Schlüssel."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<unterschiedlich>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Werte ändern?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
-#, java-format
-msgid ""
-"Warning: failed to put properties dialog always on top. Exception was: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#, java-format
+msgid "Warning: failed to put properties dialog always on top. Exception was: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4759,49 +4619,40 @@
 msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Bitte wählen Sie einen Schlüssel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Bitte wählen Sie einen Wert"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 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/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "Eigenschaften/Mitgliedschaften"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Eigenschaften der ausgewählten Objekte."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "Element von"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "Relation ändern"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "Auswahl wirklich aus Relation {0} entfernen?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "Eigenschaften hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4818,63 +4669,79 @@
 msgstr "Hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 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/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "Eigenschaften bearbeiten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 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/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Eigenschaften: {0} / Mitgliedschaften: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "Eigenschaften / Mitgliedschaften"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "Relation ändern"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "Auswahl wirklich aus Relation {0} entfernen?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+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/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "Eigenschaften entfernen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-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/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Eigenschaften: {0} / Mitgliedschaften: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "Eigenschaften / Mitgliedschaften"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "Eine Liste aller Relationen öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relationen: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Editor für die gewählte Relation öffnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Gewählte Relation löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Eine neue Relation erstellen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
+"Eine Kopie dieser Relation erstellen und diese in einem neuen Editorfenster "
+"öffnen."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4905,5 +4772,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4939,6 +4806,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr ""
 "Die Ansicht schließen. Neuöffnen mit den Schaltflächen in der linken "
@@ -4975,31 +4841,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Die zugehörige Relation des ausgewählten Relationselements bearbeiten"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
-#, fuzzy
 msgid "Download all child relations (recursively)"
-msgstr "Relationselemente herunterladen"
+msgstr "Alle Child-Verknüpfungen herunterladen (rekursiv)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "Bereich laden"
+msgstr "Alle Child-Verknüpfungen herunter laden"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "Verweisende Relationen herunterladen"
+msgstr "Ausgewählte Verknüpfungen herunter laden"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Sichtbare Kacheln laden"
+msgstr "Ausgewählte Child-Verknüpfungen herunter laden"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr "Relationselemente herunterladen"
@@ -5018,22 +4880,20 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "Es ist keine Relation ausgewählt"
+msgstr "Relation gelöscht"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "Plugin {0} herunterladen..."
+msgstr "Relation {0} wird heruntergeladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}"
+msgstr "Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
@@ -5047,12 +4907,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "Relationen"
+msgstr "Child-Verknüpfungen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
 #, java-format
-msgid ""
-"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}"
+msgid "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}"
 msgstr ""
 "Sicherheitsausnahme für setAlwaysOnTop() abgefangen. Wird ignoriert. Die "
@@ -5060,9 +4918,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr "Rolle:"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5071,15 +4929,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "Elemente aus Relationen entfernt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr "Objekt entfernen und Verbindung lösen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+msgstr "Ignorieren und die aktuelle Verbindung belassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -5089,9 +4946,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+msgstr "Mehrere Elemente verweisen auf das gleiche Primitiv"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -5101,19 +4958,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
-msgid ""
-"Add all primitives selected in the current dataset before the first member"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
+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"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
-msgid ""
-"Add all primitives selected in the current dataset after the last member"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
+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"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5123,5 +4978,5 @@
 "ausgewählten Element hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5131,67 +4986,80 @@
 "ausgewählten Element hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Remove all members referring to one of the selected primitives"
-msgstr "Objekte mit Verweis zu einem der ausgewählten Objekte herunterladen"
+msgstr ""
+"Alle Elemente welche sich auf eines der selektierten Primitive beziehen "
+"entfernen"
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Relation Editor: Remove Selected"
 msgstr "Relations-Editor: Ausgewählte entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid "Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
+msgid "Select primitives for selected relation members"
+msgstr "Objekte für gewählte Relationselemente auswählen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr "Relationselemente sortieren"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr "Relations-Editor: Sortieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "Ausgewählte Elemente nach oben schieben"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr "Relations-Editor: Nach oben verschieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "Ausgewählte Elemente nach unten schieben"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr "Relations-Editor: Nach unten verschieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Alle ausgewählten Objekte aus der Relation entfernen"
+msgstr "Das aktuell ausgewählte Element aus dieser Beziehung entfernen"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr "Relations-Editor: Entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "Gewählte Relation löschen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr "Die aktuell bearbeitete Beziehung löschen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
-#, fuzzy
+msgstr "Konflikt erstellen und schließen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr "Weiter auflösen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
-#, fuzzy
+msgstr "Bearbeitung fortsetzen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5199,13 +5067,10 @@
 "conflict and close the editor?</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>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "Konflikte in den Daten"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr "Datenkonflikt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -5214,21 +5079,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Aktuelle Daten speichern."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr "Aktualisierung übernehmen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr "Übernehmen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr "Updates anwenden und den Dialog schliessen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5238,37 +5102,37 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr "Updates abbrechen und den Dialog schliessen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr "Einen leeren Schlüssel hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr "Die ausgewählten Merkmale löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Alle nicht vollständigen Wege und Knoten der Relation herunterladen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "Elemente herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr "Relations-Editor: Elemente herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr "Definiert eine Rolle für die ausgewählten Elemente"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr "Rolle anwenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5278,42 +5142,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
-msgstr "Ja, Entfernen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgstr "Übernehmen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
-#, fuzzy
+msgstr "Nicht übernehmen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
-msgstr "Fernsteueraktion bestätigen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
-msgstr ""
-"Eine Kopie dieser Relation erstellen und diese in einem neuen Editorfenster "
-"öffnen."
+msgstr "Leere Rolle bestätigen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Herauszoomen"
+msgstr "Zoomen auf"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "Die zugehörige Relation des ausgewählten Relationselements bearbeiten"
+msgstr "Auf das Objekt zoomen, auf welches das erste ausgewählte Element verweist"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
+"Zoom ist deaktiviert, weil die Ebene der ausgewählten Relation nicht aktiv "
+"ist"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225
 msgid "Zooming disabled because there is no selected member"
-msgstr ""
+msgstr "Zoom ist deaktiviert, weil kein Element ausgewählt wurde"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24
@@ -5366,13 +5222,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "Auswahl laden"
+msgstr "Beziehung wurde geladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy
 msgid "Warning: ignoring exception because task was cancelled. Exception was: "
 msgstr ""
-"Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70
@@ -5402,7 +5255,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "Ort ändern"
+msgstr "Name des Ortes"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -5598,6 +5450,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74
 #, java-format
-msgid ""
-"Warning: failed to put history browser always on top. Exception was: {0}"
+msgid "Warning: failed to put history browser always on top. Exception was: {0}"
 msgstr ""
 
@@ -6547,5 +6398,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Georeferenzierte Bilder"
@@ -6571,5 +6422,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6588,5 +6439,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG-Bilder (*.jpg)"
@@ -6624,43 +6475,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "GPS-Punkt"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Linienaussehen anpassen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Globale Einstellungen verwenden."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Linien zwischen Punkten dieser Ebene zeichnen."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Keine Linien zwischen Punkten dieser Ebene zeichnen."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Linienaussehen wählen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Farben anpassen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6668,6 +6519,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6741,10 +6592,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Zur Daten-Ebene konvertieren"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6755,11 +6606,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6768,29 +6619,29 @@
 msgstr "Konvertiert von: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr "OSM-Daten entlang der GPS-Spur herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "Alles im Bereich herunterladen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} Meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "Maximalgebiet je Anfrage:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6801,5 +6652,5 @@
 "fortfahren?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -6807,5 +6658,5 @@
 "werden kann."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6815,5 +6666,5 @@
 "wurden ignoriert oder an den Anfang verschoben."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6839,6 +6690,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-"Warnung: Das Vermischen  von 0.6- und 0.5-Daten resultiert in Version 0.5"
+msgstr "Warnung: Das Vermischen  von 0.6- und 0.5-Daten resultiert in Version 0.5"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
@@ -6866,5 +6716,5 @@
 msgstr "Zu GPX-Ebene konvertieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6889,5 +6739,5 @@
 msgstr[1] "GPS-Spuren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6895,5 +6745,5 @@
 msgstr[1] "Punkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6902,5 +6752,5 @@
 msgstr[1] "Eine GPS-Spur mit {0} Punkten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6909,5 +6759,5 @@
 msgstr[1] "{0} besteht aus {1} GPS-Spuren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6916,9 +6766,9 @@
 msgstr[1] "{0} Punkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "GPS-Wegpunkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6926,5 +6776,5 @@
 msgstr[1] "Wegpunkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6933,16 +6783,15 @@
 msgstr[1] "{0} besteht aus {1} Wegpunkten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "Ton synchronisieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
-msgid ""
-"You need to pause audio at the moment when you hear your synchronization cue."
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
+msgid "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr ""
 "Sie müssen die Tonwiedergabe auf Pause stellen, sobald Sie Ihren "
 "Synchronisationston hören."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6950,14 +6799,14 @@
 msgstr "Ton synchronisiert bei Punkt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 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:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 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:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6967,5 +6816,5 @@
 "die Marke eingefügt werden soll."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
@@ -6973,9 +6822,9 @@
 "Offset abgeleitet werden könnte."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Texte/Symbole anzeigen/verbergen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Sichtbarkeit von Textmarken und Symbolen umschalten."
@@ -7038,6 +6887,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
 msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"Standardwert momentan unbekannt (Einstellung wurde noch nicht verwendet)."
+msgstr "Standardwert momentan unbekannt (Einstellung wurde noch nicht verwendet)."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
@@ -7103,6 +6951,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
 msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-"GPS-Spuranfang (wird immer genutzt, wenn keine anderen Marken verfügbar)."
+msgstr "GPS-Spuranfang (wird immer genutzt, wenn keine anderen Marken verfügbar)."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
@@ -7122,6 +6969,5 @@
 "Put text labels against audio (and image and web) markers as well as their "
 "button icons."
-msgstr ""
-"Audio-Marken (und Bild- und Web-Marken) und deren Bildsymbole beschriften."
+msgstr "Audio-Marken (und Bild- und Web-Marken) und deren Bildsymbole beschriften."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
@@ -7173,6 +7019,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr ""
-"Der Faktor, um den die Geschwindigkeit bei schnellem Vorlauf erhöht wird"
+msgstr "Der Faktor, um den die Geschwindigkeit bei schnellem Vorlauf erhöht wird"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
@@ -7402,6 +7247,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
-msgid ""
-"Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
+msgid "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
 msgstr ""
 "Maximallänge zum Linienzeichnen (in Meter). Verwenden Sie \"-1\", um alle "
@@ -7414,6 +7258,5 @@
 #. forceRawGpsLines
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
-msgid ""
-"Force drawing of lines if the imported data contain no line information."
+msgid "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 "Das Zeichnen von Linien erzwingen, wenn die importierten Daten keine Linien-"
@@ -7436,6 +7279,5 @@
 "Don't draw arrows if they are not at least this distance away from the last "
 "one."
-msgstr ""
-"Keine Pfeile zeichnen, wenn sie nicht den angegebenen Mindestabstand haben."
+msgstr "Keine Pfeile zeichnen, wenn sie nicht den angegebenen Mindestabstand haben."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
@@ -7607,5 +7449,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93
 msgid "Enter URL"
-msgstr ""
+msgstr "URL eingeben"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
@@ -7619,7 +7461,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
-#, fuzzy
 msgid "JOSM Plugin description URL"
-msgstr "JOSM-Pluginbeschreibungsdatei hinzufügen."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
@@ -7715,6 +7556,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
+msgid "Login password to the OSM account. Leave blank to not store any password."
 msgstr ""
 "Passwort für den OSM-Server. Leer, wenn kein Passwort gespeichert werden "
@@ -7940,6 +7780,5 @@
 "<p>The pseudo-modifier 'disabled' will disable the shortcut when encountered."
 "</p>"
-msgstr ""
-"<p>Das Pseudo-Tastaturkürzel 'disabled' deaktiviert Tastaturkürzel.</p>"
+msgstr "<p>Das Pseudo-Tastaturkürzel 'disabled' deaktiviert Tastaturkürzel.</p>"
 
 #. scroll up
@@ -8038,7 +7877,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8110,4 +7949,9 @@
 msgstr "Daten werden vorbereitet...."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, java-format
+msgid "Could not export \"{0}\""
+msgstr "Kann \"{0}\" nicht exportieren"
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -8119,7 +7963,69 @@
 msgstr "Kann \"{0}\" nicht lesen"
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Achtung: Die GPL ist nicht konform zur OSM-Lizenz. Keine GPS-Spuren, welche "
+"unter der GPL stehen, hochladen."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "GPX-Dateien"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "Beschreibung der GPS-Spur"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Information zum Autor hinzufügen."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Voller Name"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Copyright (URL)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Vordefiniert"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "Jahr des Copyrights"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Schlüsselwörter"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Export-Einstellungen"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "Exportieren und Speichern"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Fehler beim Exportieren von {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Eine vordefinierte Lizenz auswählen"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -8147,4 +8053,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Fehler: ungültige Dokumentenstruktur in GPX-Dokument"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, java-format
+msgid "Unknown mode {0}."
+msgstr "Unbekannter Modus {0}."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8248,6 +8159,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
 #, java-format
-msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+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 "
@@ -8276,14 +8186,14 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361
 msgid "Waiting 10 seconds ... "
-msgstr ""
+msgstr "Warte 10 Sekunden... "
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369
 msgid "OK - trying again."
-msgstr ""
+msgstr "OK - erneuter Versuch."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "Verzeichnis {0} untersuchen"
+msgstr "Starte Wiederholung {0} von {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8298,4 +8208,5 @@
 msgstr "Der Server hat einen Fehler mit Kode [{0} gemeldet"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8327,4 +8238,36 @@
 msgstr "Anmelden"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "OSM-Server-Dateien"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr "Erwartete eine Instanz von OsmDataLayer. Erhielt ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+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>"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+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>"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr "Sicherung der Datei konnte nicht erstellt werden. Der Fehler ist: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8348,6 +8291,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:77
 #, java-format
-msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+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-"
@@ -8357,11 +8299,9 @@
 #, java-format
 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"
+msgstr "ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ Ganzzahl"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:94
 #, java-format
-msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+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 "
@@ -8370,6 +8310,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:114
 #, java-format
-msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+msgid "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
 msgstr ""
 "ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ "
@@ -8393,30 +8332,26 @@
 msgstr "Fehler beim Parsen."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "OSM-Server-Dateien"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Unbekannte Version"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr "Fehlende Versionsnummer in OSM-Daten"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr "Unbekannte Version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr "Ein <nd> Element in einem Nicht-Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "<nd> hat Null ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "<member>-Schlüssel bei einer Nicht-Relation gefunden."
@@ -8430,6 +8365,5 @@
 #, java-format
 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}"
+msgstr "Ungültger Wert \"{1}\" des \"ref\"-Attributs eines Elements der Relation {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
@@ -8455,8 +8389,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296
 #, java-format
-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 "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}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302
@@ -8470,18 +8402,21 @@
 msgstr "Erforderliches Attribut \"{0}\" nicht vorhanden."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+#, java-format
 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 ""
-"Weg {0} als unvollständig markiert, weil referenzierte Knoten in den "
-"geladenen Daten fehlen"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, java-format
+msgid "Unknown relation member type {0}"
+msgstr "Unbekannter Relationselementtyp {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "OSM-Daten werden vorbereitet...."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "Falsch formatierte Knoten-ID"
@@ -8508,6 +8443,5 @@
 #, java-format
 msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
-msgstr ""
-"nichtnegativer Parameter \"{0}\" erwartet, stattdessen \"{1}\" erhalten"
+msgstr "nichtnegativer Parameter \"{0}\" erwartet, stattdessen \"{1}\" erhalten"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67
@@ -8525,6 +8459,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
-msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+msgid "Couldn't connect to the osm server. Please check your internet connection."
 msgstr ""
 "Verbindung zum OSM-Server fehlgeschlagen. Bitte prüfen sie ihre "
@@ -8610,9 +8543,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "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."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8654,6 +8585,5 @@
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr ""
-"Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?"
+msgstr "Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178
@@ -8671,6 +8601,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283
 #, java-format
-msgid ""
-"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgid "An unexpected exception occurred that may have come from the ''{0}'' plugin."
 msgstr ""
 "Eine unvorhergesehene Fehlersituation trat auf, die das Plugin \"{0}\" "
@@ -8683,6 +8612,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-msgid ""
-"Try updating to the newest version of this plugin before reporting a bug."
+msgid "Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
 "Versuchen Sie zuerst eine Aktualisierung auf die neueste Version des "
@@ -8706,7 +8634,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "Keine Plugin-Informationen gefunden."
+msgstr "Plugin-Information"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8852,4 +8779,6 @@
 "was: {1}"
 msgstr ""
+"Warnung: auf das Verzeichnis ''{0}'' konnte aus Sicherheitsgründen nicht "
+"zugegriffen werden. Die Ausnahme lautet: {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201
@@ -8988,6 +8917,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261
 msgid "Upload failed. Server returned the following message: "
-msgstr ""
-"Hochladen fehlgeschlagen. Der Server hat folgene Meldung zurückgegeben: "
+msgstr "Hochladen fehlgeschlagen. Der Server hat folgene Meldung zurückgegeben: "
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303
@@ -9101,23 +9029,23 @@
 msgstr "Leere Datei im Verzeichnis {0} gefunden\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Fehler beim Lesen der Dateien im Verzeichnis {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr "Mit GPX korrelieren"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} wurden als GPS-markiert erkannt."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "Bilder mit AgPifoJ öffnen..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9295,6 +9223,5 @@
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730
-msgid ""
-"The selected GPX track doesn't contain timestamps. Please select another one."
+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 "
@@ -9372,5 +9299,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Fehler beim Laden der Datei"
@@ -9419,30 +9346,13 @@
 msgstr "Montagetabelle wählen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr "Kataster"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr "Automatische Quellenangabe"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr "Ungültige Projektion"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr "Ändern Sie die Projektion vorher auf {0}."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-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."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9455,9 +9365,9 @@
 "Wollen Sie <F11> wieder zum Bilder holen nutzen?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr "Tastaturkürzel <F11> wiederherstellen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM wird zum Aktivieren der Änderung beendet."
@@ -9509,6 +9419,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
-msgstr ""
-"<html>Wert des Schlüssels \"source\" wenn autosourcing aktiviert ist</html>"
+msgstr "<html>Wert des Schlüssels \"source\" wenn autosourcing aktiviert ist</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65
@@ -9567,6 +9476,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167
 msgid "Oldest files are automatically deleted when this size is exceeded"
-msgstr ""
-"Alte Dateien werden automatisch gelöscht wenn diese Größe überschritten wird"
+msgstr "Alte Dateien werden automatisch gelöscht wenn diese Größe überschritten wird"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78
@@ -9635,13 +9543,22 @@
 msgstr "Gebäudeumriss extrahieren"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr "Bild vom französischen Kataster-WMS herunterladen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Kataster: {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+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."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9710,5 +9627,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr "WMS justieren"
@@ -10354,6 +10271,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
 msgid "Maximum number of segments allowed in each generated way. Default 250."
-msgstr ""
-"Maximale Anzahl von Abschnitten in jedem generierten Weg. Standard ist 250."
+msgstr "Maximale Anzahl von Abschnitten in jedem generierten Weg. Standard ist 250."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
@@ -10383,6 +10299,5 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 "Auflösung der Landsat-Kacheln, gemessen in Pixel pro Grad. Standard ist "
@@ -10421,6 +10336,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum age of each cached file in days. Default is 100"
-msgstr ""
-"Maximales Dateialter von gespeicherten Dateien in Tagen. Standard ist 100"
+msgstr "Maximales Dateialter von gespeicherten Dateien in Tagen. Standard ist 100"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
@@ -10444,22 +10358,26 @@
 msgstr "Kann Bild nicht laden"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr "Verbinden"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr "Verbunden"
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr "Nicht verbunden"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr "Verbindung fehlgeschlagen"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+msgid "no name"
+msgstr "Kein Name"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10492,11 +10410,11 @@
 msgstr "Live GPS-Ebene"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
 msgstr "GPS-Spur aufzeichnen"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
@@ -10504,22 +10422,22 @@
 "anzeigen."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center Once"
 msgstr "Einmalig zentrieren"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center the LiveGPS layer to current position."
 msgstr "Die LiveGPS-Ebene auf die aktuelle Position zentrieren."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr "Automatisch zentrieren"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Die LiveGPS-Ebene kontinuierlich auf die aktuelle Position zentrieren."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr "Live GPS"
@@ -10774,24 +10692,24 @@
 msgstr "Erlaubte Aktionen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Die Fernsteuerung soll Daten vom API herunterladen."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr "Details der Anfrage: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr "Soll dies erlaubt werden?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr "Fernsteueraktion bestätigen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Die Fernsteuerung soll Daten von folgender URL herunterladen:"
@@ -11002,6 +10920,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:47
 msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
-msgstr ""
-"Das Surveyor-Plugin benötigt das LiveGPS-Plugin, konnte es aber nicht finden!"
+msgstr "Das Surveyor-Plugin benötigt das LiveGPS-Plugin, konnte es aber nicht finden!"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
@@ -11031,10 +10948,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
-msgstr "Anfang"
+#, java-format
+msgid "{0} start"
+msgstr "{0} Anfang"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr "Ende"
+#, java-format
+msgid "{0} end"
+msgstr "{0} Ende"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11069,6 +10988,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
 msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-"INFO: Gehe in den Kompatibilitätsmodus von JOSM mit Main.getCurrentDataSet()"
+msgstr "INFO: Gehe in den Kompatibilitätsmodus von JOSM mit Main.getCurrentDataSet()"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
@@ -11111,6 +11029,5 @@
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
-msgid ""
-"Open the tagging preset test tool for previewing tagging preset dialogs."
+msgid "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
 "Testwerkzeug für Objektvorlagen öffnen, um eine Vorschau auf die Dialoge der "
@@ -11119,6 +11036,5 @@
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
 msgid "You have to specify tagging preset sources in the preferences first."
-msgstr ""
-"Sie müssen zuerst in den Einstellungen eine Quelle für Vorlagen angeben."
+msgstr "Sie müssen zuerst in den Einstellungen eine Quelle für Vorlagen angeben."
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
@@ -11382,6 +11298,5 @@
 #, java-format
 msgid "The selection contains {0} way. Are you sure you want to simplify it?"
-msgid_plural ""
-"The selection contains {0} ways. Are you sure you want to simplify them all?"
+msgid_plural "The selection contains {0} ways. Are you sure you want to simplify them all?"
 msgstr[0] ""
 "Diese Auswahl enthält {0} Weg. Sind Sie sich, dass er vereinfacht werden "
@@ -11442,6 +11357,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show the informational tests in the upload check windows."
-msgstr ""
-"Warnungen des Typs \"Information\" im Prüffenster beim Hochladen anzeigen."
+msgstr "Warnungen des Typs \"Information\" im Prüffenster beim Hochladen anzeigen."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
@@ -11457,6 +11371,5 @@
 "An OSM data validator that checks for common errors made by users and editor "
 "programs."
-msgstr ""
-"Ein OSM-Datenprüfer, der auf häufige Fehler der Benutzer und Editoren prüft."
+msgstr "Ein OSM-Datenprüfer, der auf häufige Fehler der Benutzer und Editoren prüft."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
@@ -11581,10 +11494,10 @@
 msgstr "Überschneidende Wege"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr "Doppelte Knoten"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Dieser Test überprüft auf doppelte Knoten an der selben Stelle."
@@ -11659,8 +11572,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:22
-msgid ""
-"This test checks for ways that contain some of their nodes more than once."
-msgstr ""
-"Dieser Test sucht nach Wegen, die einige ihrer Knoten mehrfach enthalten."
+msgid "This test checks for ways that contain some of their nodes more than once."
+msgstr "Dieser Test sucht nach Wegen, die einige ihrer Knoten mehrfach enthalten."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
@@ -11670,6 +11581,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
-msgid ""
-"This test checks for ways with similar names that may have been misspelled."
+msgid "This test checks for ways with similar names that may have been misspelled."
 msgstr ""
 "Dieser Test prüft auf ähnlich benannte Wege, was auf Schreibfehler hinweisen "
@@ -11846,6 +11756,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use the default tag ignore file (recommended)."
-msgstr ""
-"Standarddatei zum Ignorieren von bekannten Merkmalen verwenden (empfohlen)."
+msgstr "Standarddatei zum Ignorieren von bekannten Merkmalen verwenden (empfohlen)."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
@@ -12136,6 +12045,5 @@
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24
-msgid ""
-"Display a map that was previously scanned and uploaded to walking-papers.org"
+msgid "Display a map that was previously scanned and uploaded to walking-papers.org"
 msgstr ""
 "Zeige eine Karte die vorher gescannt und auf walking-papers.org hochgeladen "
@@ -12143,6 +12051,5 @@
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29
-msgid ""
-"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)"
+msgid "Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)"
 msgstr ""
 "Geben Sie eine walking-papers.org URL oder ID (das Bit nach ?id= in der URL) "
@@ -12294,9 +12201,29 @@
 msgstr "Keine gültige WMS-URL oder ID"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr "Die Position der gewählten WMS-Ebene anpassen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+msgid "Please select the WMS layer to adjust."
+msgstr "Bitte wählen Sie die zu justierende WMS-Ebene."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+msgid "Select WMS layer"
+msgstr "WMS-Ebene wählen"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+msgid "Start adjusting"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+msgid "No layers to adjust"
+msgstr "Keine Ebenen zum justieren"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -12311,59 +12238,58 @@
 msgstr "Automatisches Laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-Ebene ({0}): Automatisches Laden mit Zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-Ebene ({0}): Laden mit Zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
-msgid ""
-"The requested area is too big. Please zoom in a little, or change resolution"
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+msgid "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 "Das angeforderte Gebiet ist zu groß. Zoomen Sie ein wenig oder ändern Sie "
 "die Auflösung"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Sichtbare Kacheln laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Auflösung ändern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Fehlerhafte Kacheln neu laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Alphakanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "WMS-Ebene in Datei speichern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr "WMS-Ebene speichern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "WMS-Ebene aus Datei laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr "WMS-Ebene laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "WMS-Datei-Version nicht unterstützt; gefunden {0}, erwartet {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Dateiformatfehler"
@@ -12471,6 +12397,5 @@
 #: build/trans_plugins.java:5
 msgid "A special handler for the French land registry WMS server."
-msgstr ""
-"Ein spezielles Plugin für die WMS-Server der französischen Landesvermessung."
+msgstr "Ein spezielles Plugin für die WMS-Server der französischen Landesvermessung."
 
 #. Plugin colorscheme
@@ -12496,6 +12421,5 @@
 #. Plugin czechaddress
 #: build/trans_plugins.java:11
-msgid ""
-"Creating and handling address nodes and buildings within Czech Republic."
+msgid "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 "Erstellen und Bearbeiten von Adressinformationen und Gebäuden in der "
@@ -12533,6 +12457,5 @@
 #: build/trans_plugins.java:21
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
-msgstr ""
-"GPS-Daten vom Datenlogger Globalsat DG100 direkt in JOSM herunterladen."
+msgstr "GPS-Daten vom Datenlogger Globalsat DG100 direkt in JOSM herunterladen."
 
 #. Plugin graphview
@@ -12564,6 +12487,5 @@
 #. Plugin livegps
 #: build/trans_plugins.java:31
-msgid ""
-"Support live GPS input (moving dot) through a connection to gpsd server."
+msgid "Support live GPS input (moving dot) through a connection to gpsd server."
 msgstr ""
 "Echtzeitunterstützung für GPS-Daten (bewegter Punkt) mittels einer "
@@ -12604,6 +12526,5 @@
 #. Plugin openvisible
 #: build/trans_plugins.java:41
-msgid ""
-"Allows opening gpx/osm files that intersect the currently visible screen area"
+msgid "Allows opening gpx/osm files that intersect the currently visible screen area"
 msgstr ""
 "Erlaubt das Öffnen von GPX- oder OSM-Dateien, welche den aktuellen Bereich "
@@ -12612,8 +12533,6 @@
 #. Plugin osmarender
 #: build/trans_plugins.java:43
-msgid ""
-"Launches FireFox to display the current visible screen as a nice SVG image."
-msgstr ""
-"Startet FireFox, um den gerade sichtbaren Bereich als SVG-Bild darzustellen."
+msgid "Launches FireFox to display the current visible screen as a nice SVG image."
+msgstr "Startet FireFox, um den gerade sichtbaren Bereich als SVG-Bild darzustellen."
 
 #. Plugin PicLayer
@@ -12731,6 +12650,5 @@
 #. Plugin wmsplugin
 #: build/trans_plugins.java:75
-msgid ""
-"Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
+msgid "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
 msgstr ""
 "Zeigt georeferenzierte Bilder als Hintergrund in JOSM (WMS Server, "
@@ -13003,5 +12921,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -15558,5 +15476,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15858,5 +15776,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15959,5 +15877,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -20583,7 +20501,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "Kraftfahrstraße"
+msgstr ""
 
 #. color tertiary
@@ -23762,5 +23679,5 @@
 msgstr "Stadt"
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23771,5 +23688,5 @@
 msgstr "Einbahnstraße"
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23779,5 +23696,5 @@
 msgstr "Kirche"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23788,5 +23705,5 @@
 msgstr "Tankstelle"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23797,5 +23714,5 @@
 msgstr "Einkaufen"
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23805,5 +23722,5 @@
 msgstr "WC"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -24036,345 +23953,2 @@
 msgstr "Terraserver Urban"
 
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "API-Initialisierung fehlgeschlagen - bitte später versuchen"
-
-#~ msgid "API initialization failed"
-#~ msgstr "API-Initialisierung fehlgeschlagen"
-
-#~ 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 "No data"
-#~ msgstr "Keine Daten"
-
-#~ msgid "Failed to update the selected primitives."
-#~ msgstr "Fehler beim Hochladen der gewählten Objekte"
-
-#~ msgid "Update failed"
-#~ msgstr "Aktualisierung fehlgeschlagen"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Objekt fehlt"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Unvollständiges anwenden"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Ebenen: {0}"
-
-#~ msgid "Conflict created"
-#~ msgstr "Ein Konflikt wurde erstellt"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr ""
-#~ "Elemente in der gewählten Tabellenzeile aus dieser Relation entfernen."
-
-#~ 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 "Validate"
-#~ msgstr "Prüfen"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Aktuelle Auswahl oder den kompletten Datensatz prüfen."
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Noch nicht implementiert."
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid "unnamed"
-#~ msgstr "unbenannt"
-
-#~ msgid "position"
-#~ msgstr "Position"
-
-#~ msgid "different"
-#~ msgstr "unterschiedlich"
-
-#~ msgid "true"
-#~ msgstr "wahr"
-
-#~ msgid "false"
-#~ msgstr "falsch"
-
-#~ msgid "Rotate"
-#~ msgstr "Drehen"
-
-#~ 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:"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "Revert"
-#~ msgstr "Rückgängig"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Alle ausgewählten Objekte in den Zustand zurücksetzen, der in der "
-#~ "Versionsliste ausgewählt ist."
-
-#~ msgid "Occupied By"
-#~ msgstr "Belegt durch"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Fehler beim Parsen der Serverantwort."
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Kann nicht mit Server verbinden."
-
-#~ msgid "image not loaded"
-#~ msgstr "Bild nicht geladen"
-
-#~ 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 "Data Layer"
-#~ msgstr "Datenebene"
-
-#~ 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 "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 "Tags (empty value deletes tag)"
-#~ msgstr "Merkmale (leerer Wert löscht das Merkmal)"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "OSM-Server kontaktieren..."
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Klicken Sie \"Neu Laden\", um die Liste zu aktualisieren"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "TCX-Datei importieren..."
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "TCX-Datei als GPS-Spur importieren"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Konflikte auflösen"
-
-#~ msgid "Change"
-#~ msgstr "Ändern"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "{0} Konflikte in {1} Objekten auflösen"
-
-#~ msgid "Add Selected"
-#~ msgstr "Ausgewähltes hinzufügen"
-
-#~ 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 "Aborting..."
-#~ msgstr "Abbrechen..."
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Konflikte: {0}"
-
-#~ 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 "Remove Selected"
-#~ msgstr "Ausgewähltes entfernen"
-
-#~ msgid "Basic"
-#~ msgstr "Standard"
-
-#~ msgid "Move Up"
-#~ msgstr "Nach oben"
-
-#~ msgid "Move Down"
-#~ msgstr "Nach unten"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Relationseditor: {0}"
-
-#~ 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 "There were conflicts during import."
-#~ msgstr "Es sind Konflikte beim Importieren aufgetreten."
-
-#~ msgid "Directly load TCX files from JOSM."
-#~ msgstr "TCX-Dateien direkt aus JOSM heraus laden."
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Alle ausgewählten Objekte als Elemente hinzufügen"
-
-#~ 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 "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 "Overlap tiles"
-#~ msgstr "Kacheln überlappen"
-
-#~ msgid "% of lat:"
-#~ msgstr "% der Breite:"
-
-#~ msgid "% of lon:"
-#~ msgstr "% der Länge:"
-
-#~ msgid "WARNING: unexpected value for preference conflict.resolution, got "
-#~ msgstr "unerwarteder Wert für die Eigenschaft conflict.resolution = "
-
-#~ msgid "Selection too big"
-#~ msgstr "Auswahl zu groß"
-
-#~ 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 "Undeleting relation..."
-#~ msgstr "Relation wiederherstellen..."
-
-#~ 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 "Keep mine"
-#~ msgstr "Meine behalten"
-
-#~ msgid "Checking whether primitive {0} is gone ..."
-#~ msgstr "Prüfe ob Objekt {0} gelöscht wurde..."
-
-#~ 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 "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 ""
-#~ "<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 "image loading..."
-#~ msgstr "Lade Bild..."
-
-#~ msgid "WGS84 Geographisch"
-#~ msgstr "WGS84 Geografisch"
-
-#~ msgid "Sort"
-#~ msgstr "Sortieren"
-
-#~ 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 "Members: {0} (linked: {1})"
-#~ msgstr "Elemente: {0} (verbunden: {1})"
Index: /applications/editors/josm/i18n/po/el.po
===================================================================
--- /applications/editors/josm/i18n/po/el.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/el.po	(revision 16973)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
 "PO-Revision-Date: 2009-07-09 11:26+0000\n"
 "Last-Translator: alichani <alichani@yahoo.co.uk>\n"
@@ -16,13 +16,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:34+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -47,15 +40,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -80,7 +65,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -88,4 +73,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -107,8 +96,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Σφάλμα"
@@ -121,5 +112,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Μη αποθηκευμένες αλλαγές"
@@ -139,16 +130,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -160,13 +150,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -183,4 +174,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "Ακύρωση"
@@ -194,5 +186,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -201,5 +193,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -210,23 +203,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -247,5 +240,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Προειδοποίηση"
@@ -279,5 +272,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -310,5 +303,5 @@
 msgstr "Αναφορές σφαλμάτων"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -369,19 +362,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Παρακαλώ επιλέξτε την γραμμή για διαγραφή."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Επιλέξτε οποιοδήποτε:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "Συγχώνευση Κόμβων"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -420,5 +410,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -451,18 +441,18 @@
 msgstr "Γεωγραφικό μήκος"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Τακτοποίηση Κόμβων σε Κύκλο"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Μετακίνηση των επιλεγμένων κόμβων σε κύκλο"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -491,18 +481,18 @@
 msgstr "Εργαλείο: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Παρακαλώ επιλέξτε τουλάχιστον τέσσερεις κόμβους."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -515,5 +505,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -638,13 +628,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -652,13 +642,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "Επιβεβαίωση συνδυασμού"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Αλλαγή κατευθήνσεων;"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -666,9 +656,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Αντισροφή και Συνδυασμός"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -677,5 +667,5 @@
 msgstr "Εισάγετε τιμές για όλες τισ διενέξεις."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -683,14 +673,14 @@
 msgstr "Επίλυση διενέξεων"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "Όλοι οι δρόμοι ήταν άδειοι"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -707,24 +697,23 @@
 msgstr "Αντιγραφή επιλεγμένων αντικειμένων στο πρόχειρο."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Παρακαλώ επιλέξτε κάτι για αντιγραφή."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Δημιουργλια Κύκλου"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Δημιουργία κύκλου από τρείς επιλεγμένους κόμβους."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "Αυτοι οι κόμβοι δεν βρίσκονται σε κύκλο."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -736,8 +725,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -757,15 +746,15 @@
 msgstr "Διαγραφή επιλεγμένων αντικειμένων."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Αντικατάσταση"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "Το αρχείο υπάρχει. Αντικατάσταση;"
@@ -827,5 +816,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -835,7 +824,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "Σφάλματα κατά την λήψη"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -846,5 +834,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Αντιγραφή"
@@ -868,92 +857,36 @@
 msgstr "Έξοδος από την εφαρμογή"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Σημείωση: Το GPL δεν είνα συμβατό με την άδεια χρήσης OSM. Μην ανεβάζετε "
-"τροχιές που είναι υπό την άδεια του GPL."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Εξαγωγή σε GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Εξαγωγή των δεδομένων σε αρχείο GPX."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Τίποτα προς εξαγωγή. Λάβετε κάποια δεδομένα πρώτα."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "περιγραφή ίχνους gps"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Προσθήκη πληροφοριών συγγραφέα"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Πραγματικό όνομα"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Copyright (URL)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Προκαθορισμένο"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "Έτος Copyright"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Λέξεις κλειδιά"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Επιλογές εξαγογής"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "Εξαγωγή και Αποθήκευση"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Σφάλμα κατά την εξαγωγή {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Επιλέξτε μια προκαθορισμένη άδεια"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "Εξαγωγή των δεδομένων σε αρχείο GPX."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -969,6 +902,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1040,5 +973,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "Ένωση Κόμβου και Γραμμής"
@@ -1049,12 +982,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Επιβεβαίωση συγχώνευσης"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "Συγχώνευση του αμέσως επόμενου επιπέδου στο επιλεγμένο επίπεδο."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1098,12 +1029,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "επιλογή"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Μετακίνηση των επιλεγμένων μελών κάτω"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1163,5 +1092,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "Νέα"
@@ -1238,5 +1167,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
-#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1244,8 +1172,4 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 msgstr ""
-"<html>Χρησιμοποιείτε την προβολή EPSG:4326 η οποία μπορεί να "
-"οδηγήσει<br>ανεπιθύμητα αποτελέσματα όταν γίνονται ορθογώνιες ευθυγραμμίσεις."
-"<br>Αλλάξτε την προβολή για να μην ξαναεμφανιστεί αυτό το μήνυμα .<br>Θέλετε "
-"να συνεχίσετε;"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1259,5 +1183,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Επικόλληση"
@@ -1269,5 +1193,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Επικόλληση ετικετών"
@@ -1314,7 +1238,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Δεν ήταν δυνατή η μετονομασία του αρχείου \"{0}\"."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1351,5 +1275,10 @@
 msgstr "Το αρχείο {0} υπάρχει. Επικάλυψη;"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "Δεν βρέθηκε διασταύρωση. Τίποτα δεν αλλάχθηκε."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1359,25 +1288,25 @@
 "αναφέρετε το σαν σφάλμα."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "Δεν υπάρχει ανοιχτό έγγραφο και τίποτα προς αποθήκευση."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Κενό έγγραφο"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "Το έγγραφο δεν περιέχει δεδομένα."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "Επιβεβαίωση αποθήκευσης"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Συγκρούσεις"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1385,57 +1314,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "Απόρριψη διενέξεων και Αποθήκευση"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "Αποθήκευση αρχείου OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "Αποθήκευση αρχείου GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "Αποθήκευση Επιπέδου"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Αδυναμία δημιουργίας αντιγράφου ασφαλείας."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Άγνωστη επέκταση αρχείου: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr "Παρουσιάστηκε σφάλμα κατά την αποθήκευση."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr "Δημιοθργήθηκε σφάλμα κατά την επαναφορά αντιγράφου ασφαλείας."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Άγνωστη επέκταση αρχείου."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "Παρουσιάστηκε σφάλμα κατά την αποθήκευση."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr "Δημιοθργήθηκε σφάλμα κατά την επαναφορά αντιγράφου ασφαλείας."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1546,5 +1437,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1552,5 +1443,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1558,5 +1449,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1807,7 +1698,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "Αποστολή όλων των αλλαγών στον δακομιστή του OSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1965,12 +1855,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "Αποστολή δεδομένων"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr "Τα παρακάτω σφάλματα συνέβησαν κατά την μαζική λήψη:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -2010,5 +1899,5 @@
 msgstr "Κατάσταση: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2016,6 +1905,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2026,8 +1915,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2072,38 +1961,38 @@
 msgstr "επιλεγμένο"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "Δεν μπορείτε να προσθέσετε κόμβο εκτός κόσμου."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Προσθήκη κόμβου"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "Δημιοθργία νέου κόμβου."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "Επιλογή κόμβου στο σημείο του κέρσορα."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2112,14 +2001,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "Τέλος σχεδιασμού."
@@ -2139,5 +2028,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2152,5 +2041,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "Αφήστε το πλήκτρο του ποντικιού για να σταματήσετε την περιστροφή"
@@ -2185,9 +2074,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2197,13 +2086,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2212,5 +2101,5 @@
 "συγχώνευση με το πλησιέστερο κόμβο."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2428,26 +2317,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "Αναμενόταν κλείσιμο παρένθεσης."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2456,5 +2345,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2544,8 +2433,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Επίλυση Διένεξης"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2557,10 +2445,10 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "Δεν βρέθηκε αποτέλεσμα για ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2604,5 +2492,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "Διαγραφή από σχέση"
@@ -2617,5 +2505,5 @@
 "Διαγραφή απο την σχέση;"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr ""
@@ -2623,5 +2511,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2633,8 +2522,7 @@
 "μπορεί να τους χρησιμοποιούν.<br>Είστε σίγουροι οτι επιθυμείτε διαγραφή;"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "Διαγραφή από σχέση"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2644,9 +2532,223 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Μετακίνηση"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "Συγχώνευση {0} κόμβων"
+msgstr[1] "Συγχώνευση {0} κόμβων"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr "Αφαίρεση αναφοράς από την σχέση {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "{0} κόμβος"
+msgstr[1] "{0} κόμβοι"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Ακολουθία"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Εφαρμογή;"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Σχέση"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Παλιός ρόλος"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "Νέος ρόλος"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Παλιό κλειδί"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Παλιά τιμή"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Καινούργιο κλειδί"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "Καινούργια τιμή"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Εφαρμογή επιλεγμένων αλλαγών"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Να μην εφαρμοστούν οι αλλαγές"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "Παρακαλώ επιλέξτε ποιές αλλαγές ιδιοτήτων θέλετε να εφαρμόσετε."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Ιδιότητες του "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr "Ρόλοι σε σχέσεις που αναφέροντε στο"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Αυτόματη διόρθωση ετικέτας"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Αδυναμία ανοίγματος φακέλου προτιμήσεων: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr ""
+"Το αρχείο προτιμήσεων είχε σφάλματα. Δημιουργείται αντίγραφο ασφαλείας στο "
+"{0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Οι προτιμήσεις αποθηκεύθηκαν στο {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Αδυναμία αποστολής προτιμήσεων. Λόγος: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "Αδυναμία φόρτωσης προτιμήσεων από διακομηστή"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "Δεκαδικές Μοίρες"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "Μοίρες Λεπτά Δεύτερα Λεπτα"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "Ν"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "Β"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "Δ"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "Α"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "Αλλαγή {0} αντικειμένου"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "μη ολοκληρωμένη"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2660,210 +2762,4 @@
 msgstr[1] "κόμβοι"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr "Αφαίρεση αναφοράς από την σχέση {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Ακολουθία"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Εφαρμογή;"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "Σχέση"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "Παλιός ρόλος"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "Νέος ρόλος"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Παλιό κλειδί"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Παλιά τιμή"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Καινούργιο κλειδί"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "Καινούργια τιμή"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "Εφαρμογή επιλεγμένων αλλαγών"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "Να μην εφαρμοστούν οι αλλαγές"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "Παρακαλώ επιλέξτε ποιές αλλαγές ιδιοτήτων θέλετε να εφαρμόσετε."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "Ιδιότητες του "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr "Ρόλοι σε σχέσεις που αναφέροντε στο"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "Αυτόματη διόρθωση ετικέτας"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Αδυναμία ανοίγματος φακέλου προτιμήσεων: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr ""
-"Το αρχείο προτιμήσεων είχε σφάλματα. Δημιουργείται αντίγραφο ασφαλείας στο "
-"{0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Οι προτιμήσεις αποθηκεύθηκαν στο {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Αδυναμία αποστολής προτιμήσεων. Λόγος: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "Αδυναμία φόρτωσης προτιμήσεων από διακομηστή"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "Δεκαδικές Μοίρες"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "Μοίρες Λεπτά Δεύτερα Λεπτα"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "Ν"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "Β"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "Δ"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "Α"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "μη ολοκληρωμένη"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2895,5 +2791,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2926,5 +2822,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -2933,22 +2829,22 @@
 msgstr[1] "{0} μέλη"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "Οδός ταχείας κυκλοφορίας"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "σιδηρόδρομος"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "υδατόρρευμα"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "χρήση γής"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -3013,10 +2909,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "Άδειο μέλος στη σχέση."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3024,5 +2922,5 @@
 msgstr "Διαγράφηκε το μέλος ''{0}'' της σχέσης."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3030,57 +2928,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Άγνωστος ρόλος \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Άγνωστος τύπος μέλους για το \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr "Οδός \"από\" δεν βρέθηκε."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3132,5 +3030,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3164,4 +3062,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3201,13 +3103,25 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "Αδυναμία ανάγνωσης σελιδοδεικτών."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "Αδυναμία εγγραφής σελιδοδείκτη."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3240,4 +3154,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3269,16 +3184,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "Μη Αναμενόμενη Εξαίρεση"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
 msgstr ""
-"Aδύνατη η σύνδεση με τον OSM server.Παρακαλω ελέγξτε την σύνδεση σας στο "
-"Internet."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3505,6 +3417,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3533,39 +3445,39 @@
 msgstr "Ήχος"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "Μετακίνηση δεξιά"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Χάρτης: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "Μετακίνηση αριστερά"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Μετακίνηση πάνω"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Μετακίνηση Κάτω"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "Μεγέθυνση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Σμίκρυνση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "κλίμακα"
@@ -3599,10 +3511,10 @@
 msgstr "(κανένα αντικείμενο)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "το επίπεδο δεν είναι στη λίστα."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3684,12 +3596,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3698,6 +3610,6 @@
 msgstr "Ετικέτες"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3705,47 +3617,47 @@
 msgstr "Κόμβοι"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Μέλη"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#, java-format
+msgid "{0} pending tag conflicts to be resolved"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
-#, java-format
-msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3753,25 +3665,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Επίλυση σύγκρουσης"
@@ -3974,8 +3886,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4194,5 +4106,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4205,5 +4117,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4238,6 +4150,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4250,6 +4162,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4320,7 +4232,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4385,7 +4297,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Συνέχεια έτσι κι αλλιώς"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4412,7 +4323,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Επίλυση συγκρούσεων"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4463,99 +4374,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Επίπεδα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Άνοιγμα λίστας όλων τον φορτωμένων απιπέδων."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Διαγραφή του επιλεγμένου επιπέδου."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "Υπάρχουν μη αποθηκευμένες αλλαγές. Διαγραφή οτυ επιπέδου οποσδήποτε;"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "Διαγραφή Επιπέδου"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε όλο το επίπεδο;"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Πληροφορίες"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "ναι"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "Β"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Διαγραφή"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "Διαγραφή {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Εμφάνιση/Απόκρυψη"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Εναλλαγή κατάστασης ορατότητας του επιλεγμένου επιπέδου."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "ιδιωτικό"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "Διαγραφή του επιλεγμένου επιπέδου."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "Συγχώνευση του αμέσως επόμενου επιπέδου στο επιλεγμένο επίπεδο."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή πάνω."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή κάτω."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "Περισότερες πληροφορίες για αυτό το χαρακτηριστικό"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4564,22 +4468,22 @@
 msgstr[1] "Αυτό θα αλλάξει εώς {0} αντικείμενα."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "Κενή τιμή διαγράφει το κλειδί."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<διαφορετικά>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Αλλαγή τιμών;"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4587,5 +4491,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4594,50 +4498,41 @@
 msgstr[1] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Παρακαλώ επιλέξτε κλειδί"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Παρακαλώ επιλέξτε μια τιμή"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 "Παρακαλώ επιλέξτε τα αντικείμενα των οποίων τις ιδιότητες θέλετε να αλλάξετε."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "Ιδιότητες/Υπαγωγές"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Ιδιότητες επιλεγμένων αντικειμένων."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "Μέλος του"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "Αλλαγή σχέσης"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "Σίγουρα επιθυμήτε την διαγραφή της επιλογής από την σχέση {0};"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "Προσθήκη Ιδιοτήτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4654,63 +4549,77 @@
 msgstr "Προσθήκη"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Add a new key/value pair to all objects"
 msgstr "Προσθήκη νέου ζεύγους κλειδιού/τιμής σε όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "Επεξεργασία Ιδιοτήτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 msgid "Edit the value of the selected key for all objects"
 msgstr "Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Ιδιότητες: {0} / Υπαγωγές: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "Ιδιότητες / Υπαγωγές"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "Αλλαγή σχέσης"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "Σίγουρα επιθυμήτε την διαγραφή της επιλογής από την σχέση {0};"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "Διαγραφή του επιλεγμένου κλειδιού από όλα τα αντικείμενα"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "Διαγραφή Ιδιοτήτων"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "Διαγραφή του επιλεγμένου κλειδιού από όλα τα αντικείμενα"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Ιδιότητες: {0} / Υπαγωγές: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "Ιδιότητες / Υπαγωγές"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Σχέσεις"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "Άνοιγμα λίστας όλων τον σχέσεων."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "Σχέσεις: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Άνοιγμα επεξεργαστή για την επιλεγμένη σχέση"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Διαγραφή της επιλεγμένης σχέσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Σημιουργία νέας σχέσης"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4741,5 +4650,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4810,5 +4719,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -4819,21 +4728,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "Λήψη Περιοχής"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "Διαγραφή της επιλεγμένης σχέσης"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Λήψη εμφανών πλακιδίων"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr ""
@@ -4852,17 +4758,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "Σχέσεις"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "Λήψη πρόσθετου {0}..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -4880,7 +4785,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "Σχέσεις"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -4891,9 +4795,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -4902,15 +4806,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "Επανάληψη της τελευταίας αναίρεσης."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -4920,9 +4823,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -4932,15 +4835,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -4948,5 +4851,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -4954,65 +4857,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
+#, fuzzy
+msgid "Select primitives for selected relation members"
+msgstr "Διαγραφή της επιλεγμένης σχέσης"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "Μετακίνηση των επιλεγμένων μελών πάνω"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "Μετακίνηση των επιλεγμένων μελών κάτω"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Αφαίρεση όλων των επιλεγμένων αντικειμένων από την σχέση"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "Διαγραφή της επιλεγμένης σχέσης"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr "Συνέχιση επίλυσης"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5021,10 +4939,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "Αντικρουόμενη σχέση"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -5033,21 +4950,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Αποθήκευση τεχόντων δεδομένων."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5057,37 +4973,37 @@
 msgstr "Εντάξει"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "Λήψη μελών"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5097,30 +5013,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Σμίκρυνση"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "Μετακίνηση των επιλεγμένων μελών κάτω"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5181,7 +5091,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "Φόρτωση επιλογής"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -5215,7 +5124,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "Αλλαγή θέσης"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6350,5 +6258,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr ""
@@ -6374,5 +6282,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6391,5 +6299,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "Εικόνες JPEG (*.jpg)"
@@ -6427,43 +6335,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "σημείο gps"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Προσαρμογή του σχεδιασμού γραμμών"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Χρηση καθολικών ρυθμίσεων."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Σχεδίαση γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "ΠΑράλειψη σχεδίασης γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Επιλογή προτιμήσεων για τον σχεδιασμό γραμμών"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Προσαρμογή Χρώματος"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6471,6 +6379,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6544,10 +6452,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Μετατροπή σε επίπεδο δεδομένων"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6558,11 +6466,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6571,29 +6479,29 @@
 msgstr "Μετατράπηκε από: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "Λήψη όλων εντός:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} μέτρα"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "Μέγιστη περιοχή ανά αίτημα:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} τετρ. χλμ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6604,10 +6512,10 @@
 "συνεχίσετε;</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 "Δεν υπάρχει διαθέσιμο ίχνος GPX  στο επίπεδο για την συσχέτιση με τον ήχο."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6615,5 +6523,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6663,5 +6571,5 @@
 msgstr "Μετατροπή σε επίπεδο GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6686,5 +6594,5 @@
 msgstr[1] "ίχνη"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6692,5 +6600,5 @@
 msgstr[1] "σημεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6699,5 +6607,5 @@
 msgstr[1] "ένα ίχνος με {0} σημεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6706,5 +6614,5 @@
 msgstr[1] "το {0} αποτελείται από {1} ίχνη"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6713,9 +6621,9 @@
 msgstr[1] "{0} σημεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "σημάδι gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6723,5 +6631,5 @@
 msgstr[1] "σημάδια"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6730,9 +6638,9 @@
 msgstr[1] "{0} αποτελείται από {1} σημάδια"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "Συγχρονισμός ήχου"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -6741,5 +6649,5 @@
 "συγχρονισμού."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6747,14 +6655,14 @@
 msgstr "Ήχος συγχρονισμένος στο σημείο {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 msgid "Unable to synchronize in layer being played."
 msgstr "Αδυναμία συγχρονισμού στο επίπεδο που αναπαράγεται."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6762,13 +6670,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Εμφάνιση/Απόκρυψη Κειμένου/Εικονιδίων"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
@@ -7381,7 +7289,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
-#, fuzzy
 msgid "JOSM Plugin description URL"
-msgstr "Επεξεργασία URL περιγραφής  πρόσθετου του JOSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
@@ -7778,7 +7685,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -7850,4 +7757,9 @@
 msgstr "Προετοιμασία δεδομένων..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "Αδυναμία ανάγνωσης \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -7859,7 +7771,69 @@
 msgstr "Αδυναμία ανάγνωσης \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Σημείωση: Το GPL δεν είνα συμβατό με την άδεια χρήσης OSM. Μην ανεβάζετε "
+"τροχιές που είναι υπό την άδεια του GPL."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "Αρχεία GPX"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "περιγραφή ίχνους gps"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Προσθήκη πληροφοριών συγγραφέα"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Πραγματικό όνομα"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Copyright (URL)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Προκαθορισμένο"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "Έτος Copyright"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Λέξεις κλειδιά"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Επιλογές εξαγογής"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "Εξαγωγή και Αποθήκευση"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Σφάλμα κατά την εξαγωγή {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Επιλέξτε μια προκαθορισμένη άδεια"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -7887,4 +7861,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Άγνωστος ρόλος \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8017,7 +7996,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "Σάρωση καταλόγου {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8032,4 +8011,5 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8061,4 +8041,32 @@
 msgstr "Είσοδος"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "Αρχεία Διακομιστή OSM"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8116,30 +8124,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "Αρχεία Διακομιστή OSM"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Άγνωστη έκδοση"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr "Άγνωστη έκδοση: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "<nd> έχει μηδενική αναφορά"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "Βρέθηκε <member> στοιχείο εκτός σχέσης."
@@ -8189,5 +8193,5 @@
 msgstr "Ανύπαρκτο απαιτούμενο χαρακτηριστικό \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8196,9 +8200,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "Άγνωστος τύπος μέλους για το \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "Προετοιμασία δεδομένων OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "Κακοσχηματισμένο id κόμβου"
@@ -8324,9 +8333,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
-"Προειδοποίηση - ζητήθηκε η φόρτωση του {0} πρόσθετου. Το πρόσθετο δεν "
-"χρειάζεται πλέον."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8421,7 +8428,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "Δεν βρέθηκαν πληροφορίες πρόσθετων."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8811,23 +8817,23 @@
 msgstr "Βρέθηκε μηδενικό αρχείο στον κατάλογο {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Σφάλμα κατά την λήψη αρχείων από τον κατάλογο {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "Άνοιγμα εικόνων  με το AgPifoJ..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9068,5 +9074,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Σφάλμα φόρτωσης αρχείου"
@@ -9113,28 +9119,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr "Άκυρη προβολή"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr "Αλλάξτε την προβολή σε {0} πρώτα."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the JOSM projection to Lambert and restart"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9143,9 +9134,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
@@ -9309,12 +9300,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
 msgstr ""
 
@@ -9383,5 +9381,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr "Ρύθμιση WMS"
@@ -10101,22 +10099,27 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr "Γίνεται σύνδεση"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr "Σε σύνδεση"
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr "Χωρίς σύνδεση"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr "Η σύνδεση απέτυχε"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "όνομα"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10149,11 +10152,11 @@
 msgstr "Επίπεδο LiveGPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
@@ -10161,22 +10164,22 @@
 "LiveGPS."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center Once"
 msgstr "Κεντράρισμα μία φορά"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center the LiveGPS layer to current position."
 msgstr "Κεντράρισμα του επιπέδου LiveGPS στην τρέχουσα θέση."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr "Αυτόματο Κεντράρισμα"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Κεντράρισμα του επιπέδου LiveGPS στην τρέχουσα θέση συνεχώς."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -10418,24 +10421,24 @@
 msgstr "Επιτρεπώμενες ενέργειες"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr "Θέλετε να το επιτρέψετε;"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -10674,10 +10677,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
+#, fuzzy, java-format
+msgid "{0} start"
 msgstr "αρχή"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr "τέλος"
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} κόμβος"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11202,10 +11207,10 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
@@ -11866,9 +11871,32 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr "Ρύθμιση της θέσης του επιλεγμένου επιπέδου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "Παρακαλώ επιλέξτε την γραμμή για επεξεργασία."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "Αποθήκευση επιπέδου WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+msgid "Start adjusting"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "Δεν υπάρχουν αλλαγές προς αποστολή"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11881,15 +11909,15 @@
 msgstr "Αυτόματη λήψη"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -11897,42 +11925,42 @@
 "Η ζητούμενη περιοχή είναι πολύ μεγάλη. Παρακαλώ κάντε ζουμ, ή αλλάξτε ανάλυση"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Λήψη εμφανών πλακιδίων"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Αλλαγή ανάλυσης"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Ανανέωση λανθασμένων πλακιδίων"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Κανάλι άλφα"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Αποθ'ηκευση επιπέδου WMS σε αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr "Αποθήκευση επιπέδου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "Φόρτωση επιπέδου WMS από αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr "Φόρτωση επιπέδου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Μη υποστηριζόμενη έκδοση αρχείου WMS΄ βρέθηκε {0}, αναμενόταν {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Σφάλμα μορφής αρχείου"
@@ -12518,5 +12546,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -15073,5 +15101,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15373,5 +15401,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15474,5 +15502,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -20098,7 +20126,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "Αυτοκινητόδρομος"
+msgstr ""
 
 #. color tertiary
@@ -23277,5 +23304,5 @@
 msgstr ""
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23286,5 +23313,5 @@
 msgstr "Μονόδρομος"
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23294,5 +23321,5 @@
 msgstr "Εκκλησία"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23303,5 +23330,5 @@
 msgstr "Σταθμός Καυσίμων"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23312,5 +23339,5 @@
 msgstr ""
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23320,5 +23347,5 @@
 msgstr "WC"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23551,29 +23578,18 @@
 msgstr "Terraserver Urban"
 
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Αποτυχία αρχικοποίησης API. Παρακαλώ προσπαθήστε αργότερα."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Αποτυχία αρχικοποίησης API"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Δεν βρέθηκαν δεδομένα για ενημέρωση. Έχετε ήδη ανοίξει ή λάβει ένα "
-#~ "επίπεδο δεδομένων;"
-
-#~ msgid "Update failed"
-#~ msgstr "Αποτυχία ενημέρωσης"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Εφαρμογή μερικών επιλύσεων"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Επίπεδα: {0}"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr ""
-#~ "Αφαίρεση του μέλους στην τρέχουσα σειρά του πίνακα από αυτήν την σχέση"
+#~ msgid "Unknown file extension."
+#~ msgstr "Άγνωστη επέκταση αρχείου."
+
+#~ msgid "Move"
+#~ msgstr "Μετακίνηση"
+
+#~ msgid "Invalid projection"
+#~ msgstr "Άκυρη προβολή"
+
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Αλλάξτε την προβολή σε {0} πρώτα."
+
+#~ msgid "end"
+#~ msgstr "τέλος"
 
 #~ msgid ""
@@ -23583,7 +23599,4 @@
 #~ "Το πρόσθετο δεν μπορεί να αφαιρεθεί. Παρακαλώ πείτε στα άτομα από τα "
 #~ "οποία πήρατε το JOSM για το πρόβλημα."
-
-#~ msgid "Validate"
-#~ msgstr "Επαλήθευση"
 
 #~ msgid "Server does not support changesets"
@@ -23670,4 +23683,8 @@
 #~ msgstr "Προσθήκη επιλεγμένων"
 
+#~ msgid "Remove the member in the current table row from this relation"
+#~ msgstr ""
+#~ "Αφαίρεση του μέλους στην τρέχουσα σειρά του πίνακα από αυτήν την σχέση"
+
 #~ msgid "Cannot connect to server."
 #~ msgstr "Αδυναμία σύνδεσης με το διακομιστή"
@@ -23745,4 +23762,7 @@
 #~ msgstr "Πηγές προεπιλογών ετικετών"
 
+#~ msgid "Layers: {0}"
+#~ msgstr "Επίπεδα: {0}"
+
 #~ msgid "Error parsing server response."
 #~ msgstr "Σφάλμα κατά την ανάλυση της απάντησης του διακομιστή."
@@ -23750,4 +23770,7 @@
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "Επιθυμείτε την σημείωση αυτού του θέματος ως \"τελειωμένο\";"
+
+#~ msgid "Validate"
+#~ msgstr "Επαλήθευση"
 
 #~ msgid "YAHOO (GNOME)"
@@ -23846,4 +23869,23 @@
 #~ "A> ή <A HREF=\"{1}\">στη γλώσσα σας</A>."
 
+#~ msgid ""
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
+#~ msgstr ""
+#~ "Δεν βρέθηκαν δεδομένα για ενημέρωση. Έχετε ήδη ανοίξει ή λάβει ένα "
+#~ "επίπεδο δεδομένων;"
+
+#~ msgid "Failed to initialize API. Please try again later."
+#~ msgstr "Αποτυχία αρχικοποίησης API. Παρακαλώ προσπαθήστε αργότερα."
+
+#~ msgid "API initialization failed"
+#~ msgstr "Αποτυχία αρχικοποίησης API"
+
+#~ msgid "Update failed"
+#~ msgstr "Αποτυχία ενημέρωσης"
+
+#~ msgid "Apply partial resolutions"
+#~ msgstr "Εφαρμογή μερικών επιλύσεων"
+
 #~ msgid "Error when communicating with server."
 #~ msgstr "Σφάλμα κατά την επικοινωνία με τον διακομιστή."
Index: /applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- /applications/editors/josm/i18n/po/en_GB.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/en_GB.po	(revision 16973)
@@ -10,6 +10,6 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-07-27 19:58+0000\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-04 10:57+0000\n"
 "Last-Translator: Michael Keppler <Bananeweizen@gmx.de>\n"
 "Language-Team: British English <en@li.org>\n"
@@ -18,13 +18,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:34+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -49,15 +42,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -82,7 +67,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -90,4 +75,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -109,8 +98,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Error"
@@ -121,5 +112,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Unsaved Changes"
@@ -139,16 +130,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -160,13 +150,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -183,4 +174,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "Cancel"
@@ -194,5 +186,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -201,5 +193,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -210,23 +203,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -247,5 +240,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Warning"
@@ -279,5 +272,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -310,5 +303,5 @@
 msgstr "Bug Reports"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -373,19 +366,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Please select the row to delete."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Select either:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "Merge Nodes"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -424,5 +414,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -455,18 +445,18 @@
 msgstr "Longitude"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Align Nodes in Circle"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Move the selected nodes into a circle."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -495,18 +485,18 @@
 msgstr "Tool: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Please select at least four nodes."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -519,5 +509,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -646,13 +636,13 @@
 msgstr "Combine several ways into one."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Please select at least two ways to combine."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "Combine ways with different memberships?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -662,13 +652,13 @@
 "combine them?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "Combine Anyway"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Change directions?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -678,9 +668,9 @@
 "reverse some of them?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Reverse and Combine"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -689,5 +679,5 @@
 msgstr "Enter values for all conflicts."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -695,14 +685,14 @@
 msgstr "Solve Conflicts"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combine {0} ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "All the ways were empty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -721,24 +711,23 @@
 msgstr "Copy selected objects to paste buffer."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Please select something to copy."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Create Circle"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Create a circle from three selected nodes."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "Those nodes are not in a circle."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -752,8 +741,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -773,15 +762,15 @@
 msgstr "Delete selected objects."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Overwrite"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "File exists. Overwrite?"
@@ -842,5 +831,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -850,7 +839,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "Errors during Download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -861,5 +849,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Duplicate"
@@ -883,92 +872,36 @@
 msgstr "Exit the application."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Export to GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Export the data to GPX file."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Nothing to export. Get some data first."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr "parameter ''{0}'' must not be null"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "gps track description"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Add author information"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Real name"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Copyright (URL)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Predefined"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "Copyright year"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Keywords"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Export options"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "Export and Save"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Error while exporting {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Choose a predefined licence"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "Export the data to GPX file."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -984,6 +917,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1056,5 +989,5 @@
 msgstr "Join a node into the nearest way segments"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "Join Node and Line"
@@ -1065,12 +998,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Merge Anyway"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "Merge the layer directly below into the selected layer."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1114,12 +1045,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "selection"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Updates the currently selected primitives from the server"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1179,5 +1108,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "New"
@@ -1252,5 +1181,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
-#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1258,7 +1186,4 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 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?"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1272,5 +1197,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Paste"
@@ -1282,5 +1207,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Paste Tags"
@@ -1327,7 +1252,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Could not rename the file \"{0}\"."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1364,5 +1289,10 @@
 msgstr "File {0} exists. Overwrite?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "No intersection found. Nothing was changed."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1372,25 +1302,25 @@
 "a bug."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "No document open so nothing to save."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Empty document"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "The document contains no data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "Save anyway"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Conflicts"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1400,59 +1330,19 @@
 "if you rejected all. Continue?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "Reject Conflicts and Save"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "Save OSM file"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "Save GPX file"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "Save Layer"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Could not back up file."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Unknown file extension: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr ""
-"<html>An error occurred while communicating with the server<br>Details: {0}</"
-"html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr "An error occurred while restoring backup file."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Unknown file extension."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "An error occurred while saving."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr "An error occurred while restoring backup file."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1566,23 +1456,17 @@
 "middle of the way.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
 "should verify this and correct it when necessary.</html>"
 msgstr ""
-"A role based relation membership was copied to all new ways.\n"
-"You should verify this and correct it when necessary."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
-#, fuzzy
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
 "this and correct it when necessary.</html>"
 msgstr ""
-"A relation membership was copied to all new ways.\n"
-"You should verify this and correct it when necessary."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1721,12 +1605,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
-#, fuzzy
 msgid "No current dataset found"
-msgstr "No GPX data layer found."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
-#, fuzzy
 msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr "Could not find primitive with id {0} in the current dataset"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
@@ -1846,7 +1728,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "Upload all changes to the OSM server."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1985,8 +1866,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
@@ -2004,12 +1885,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "Uploading data"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr "The following errors occurred during mass download:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -2054,5 +1934,5 @@
 msgstr "Mode: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2062,6 +1942,6 @@
 "when deleting a way. Ctrl: delete referring objects."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2072,8 +1952,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2118,38 +1998,38 @@
 msgstr "selected"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "Cannot add a node outside of the world."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Add node"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Add node into way"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "Connect existing way to node"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Add a new node to an existing way"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "Add node into way and connect"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "Create new node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "Select node under cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2158,14 +2038,14 @@
 msgstr[1] "Insert new node into {0} ways."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "Start new way from last node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "Continue way from last node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "Finish drawing."
@@ -2185,5 +2065,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Release the mouse button to select the objects in the rectangle."
@@ -2194,5 +2074,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "Release the mouse button to stop rotating."
@@ -2229,9 +2109,9 @@
 msgstr[1] "Add and move a virtual new node to {0} ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr "Move elements"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2244,13 +2124,13 @@
 "Really move them?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr "Move them"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr "Undo move"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2258,5 +2138,5 @@
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2482,26 +2362,26 @@
 msgstr "Unknown primitive type: {0}. Allowed values are node, way or relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Unexpected token: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr "Missing arguments for or."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr "Missing argument for not."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "Expected closing bracket."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Wrong number of parameters for nodes operator."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2512,5 +2392,5 @@
 "nodes or range, for example nodes:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2600,23 +2480,22 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Solve Conflict"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
 "primitmive ''{1}''"
-msgstr "already registered a conflict for primitive ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "No match found for ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2661,5 +2540,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "Delete from relation"
@@ -2674,5 +2553,5 @@
 "Delete from relation?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr "Split way segment"
@@ -2680,5 +2559,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2690,8 +2570,7 @@
 "be using them.<br>Do you really want to delete?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "Delete from relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2701,9 +2580,225 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Move"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "Merge {0} nodes"
+msgstr[1] "Merge {0} nodes"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr "Purging 1 primitive"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr "removing reference from way {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+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}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr "removing reference from relation {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr "Resolve conflicts in member list of relation {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr "Remove relation member {0} {1}"
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "Rotate {0} {1}"
+msgstr[1] "Rotate {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Sequence"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "Resolve {0} tag conflicts in {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr "Undelete {0} primitives"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr "Resolve version conflicts for {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr "Resolve conflicts in node list of way {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr "Main dataset does not include node {0}"
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Apply?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Relation"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Old role"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "New role"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Old key"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Old value"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "New key"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "New value"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Apply selected changes"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Don't apply changes"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "Please select which property changes you want to apply."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Properties of "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr "Roles in relations referring to"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Automatic tag correction"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Malformed config file at lines {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Cannot open preferences directory: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr "Preferences file had errors. Making backup of old one to {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Preferences stored on {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Could not upload preferences. Reason: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "Could not load preferences from server."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr "already registered a conflict for primitive ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "Decimal Degrees"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "Degrees Minutes Seconds"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "W"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "E"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "Change {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr "parameter {0} > 0 required. Got {1}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "incomplete"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2717,212 +2812,4 @@
 msgstr[1] "nodes"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr "Purging 1 primitive"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr "removing reference from way {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-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}"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr "removing reference from relation {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr "Resolve conflicts in member list of relation {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr "Remove relation member {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr "Rotate {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Sequence"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "Resolve {0} tag conflicts in {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr "Undelete {0} primitives"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "Resolve version conflicts for {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr "Resolve conflicts in node list of way {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr "Main dataset does not include node {0}"
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Apply?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "Relation"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "Old role"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "New role"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Old key"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Old value"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "New key"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "New value"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "Apply selected changes"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "Don't apply changes"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "Please select which property changes you want to apply."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "Properties of "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr "Roles in relations referring to"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "Automatic tag correction"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Malformed config file at lines {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Cannot open preferences directory: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr "Preferences file had errors. Making backup of old one to {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Preferences stored on {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Could not upload preferences. Reason: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "Could not load preferences from server."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr "already registered a conflict for primitive ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "Decimal Degrees"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "Degrees Minutes Seconds"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "W"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "E"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "parameter {0} > 0 required. Got {1}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "incomplete"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2954,5 +2841,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2985,5 +2872,5 @@
 msgstr "parameter ''{0}'' is not an acceptable class, got ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -2992,22 +2879,22 @@
 msgstr[1] "{0} members"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "highway"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "railway"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "waterway"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "landuse"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -3072,10 +2959,12 @@
 msgstr "multipolygon way ''{0}'' is not closed."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "Empty member in relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3083,5 +2972,5 @@
 msgstr "Deleted member ''{0}'' in relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3089,57 +2978,57 @@
 msgstr "Way ''{0}'' with less than two points."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr "More than one \"from\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr "More than one \"to\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr "More than one \"via\" found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Unknown role ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Unknown member type for ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr "No \"from\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr "No \"to\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr "No \"via\" node or way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3191,5 +3080,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3226,4 +3115,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3263,13 +3156,25 @@
 msgstr "UTM Zone {0}"
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "Could not read bookmarks."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "Could not write bookmark."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3307,4 +3212,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3336,15 +3242,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "Unexpected Exception"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
 msgstr ""
-"Couldn't connect to the osm server. Please check your internet connection."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3353,5 +3257,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -3359,6 +3263,4 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-"Failed to initialize communication with the OSM server {0}.\n"
-"Check the server URL in your preferences and your internet connection."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
@@ -3382,7 +3284,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: failed to bring extended dialog always on top. Exception: {0}"
-msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65
@@ -3578,6 +3480,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3606,39 +3508,39 @@
 msgstr "Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "Move right"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Map: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "Move left"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Move up"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Move down"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "Zoom in"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Zoom out"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "scale"
@@ -3672,10 +3574,10 @@
 msgstr "(no object)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "layer not in list."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3758,12 +3660,12 @@
 msgstr "role {0} is not participating in compare pair {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3772,6 +3674,6 @@
 msgstr "Tags"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3779,30 +3681,30 @@
 msgstr "Nodes"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Members"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "No pending tag conflicts to be resolved"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Tags({0} conflicts)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} pending tag conflicts to be resolved"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Nodes(resolved)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
@@ -3810,17 +3712,17 @@
 "Merged node list frozen. No pending conflicts in the node list of this way"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Nodes(with conflicts)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "Pending conflicts in the node list of this way"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Members(resolved)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3830,25 +3732,25 @@
 "relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Members(with conflicts)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Pending conflicts in the member list of this relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr "No pending property conflicts"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Properties(with conflicts)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr "Pending property conflicts to be resolved"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Conflict Resolution"
@@ -4062,8 +3964,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4298,5 +4200,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4309,5 +4211,5 @@
 msgstr "Primitive"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr "merged nodes not frozen yet. Can't build resolution command"
@@ -4342,6 +4244,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4354,6 +4256,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4424,7 +4326,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4488,7 +4390,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Continue anyway"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4497,5 +4398,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>You didn''t finish to merge the differences in this conflict."
@@ -4505,8 +4406,4 @@
 "<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210
@@ -4519,7 +4416,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Resolve version conflicts for {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4568,99 +4465,92 @@
 msgstr "Display the history of the selected primitive"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Layers"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Open a list of all loaded layers."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Delete the selected layer."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "There are unsaved changes. Delete the layer anwyay?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "Delete Layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "Do you really want to delete the whole layer?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Information"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "yes"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Delete"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "Delete {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Show/Hide"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Toggle visible state of the selected layer."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "private"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "Delete the selected layer."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "Merge the layer directly below into the selected layer."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Move the selected layer one row up."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Move the selected layer one row down."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "Information Board"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4669,22 +4559,22 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "An empty value deletes the key."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<different>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Change values?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4692,5 +4582,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4699,49 +4589,40 @@
 msgstr[1] "Change properties of up to {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Please select a key"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Please select a value"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Please select the objects you want to change properties for."
 msgstr "Please select the objects you want to change properties for."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "Properties/Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Properties for selected objects."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "Member Of"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "Change relation"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "Really delete selection from relation {0}?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "Add Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4758,63 +4639,77 @@
 msgstr "Add"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Add a new key/value pair to all objects"
 msgstr "Add a new key/value pair to all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "Edit Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edit the value of the selected key for all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Properties: {0} / Memberships: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "Properties / Memberships"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "Change relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "Really delete selection from relation {0}?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "Delete the selected key in all objects"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "Delete Properties"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "Delete the selected key in all objects"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Properties: {0} / Memberships: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "Properties / Memberships"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "Open a list of all relations."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relations: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Open an editor for the selected relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Delete the selected relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Create a new relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4845,5 +4740,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4912,31 +4807,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
-#, fuzzy
 msgid "Download all child relations (recursively)"
-msgstr "Download relation members"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "Download Area"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "Delete the selected relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Download visible tiles"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr "Download relation members"
@@ -4955,17 +4846,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "No relation is selected"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "Downloading Plugin {0}..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -4983,7 +4873,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "Relations"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -4994,9 +4883,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5005,15 +4894,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "Removed Element from Relations"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -5023,9 +4911,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -5035,15 +4923,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5051,5 +4939,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5057,66 +4945,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
+msgid "Remove all members referring to one of the selected primitives"
+msgstr ""
+
+#. putValue(NAME, tr("Remove Selected"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Relation Editor: Remove Selected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #, fuzzy
-msgid "Remove all members referring to one of the selected primitives"
-msgstr "Failed to update the selected primitives."
-
-#. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
-msgid "Relation Editor: Remove Selected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Select primitives for selected relation members"
+msgstr "Delete the selected relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "Move the currently selected members up"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "Move the currently selected members down"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Remove all currently selected objects from relation"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "Delete the selected relation"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr "Continue resolving"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5125,10 +5027,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "Conflicts in data"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -5137,21 +5038,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Save the current data."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5161,37 +5061,37 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Download all incomplete ways and nodes in relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "Download Members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5201,32 +5101,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
-msgstr "Yes, purge it"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
-msgstr "Confirm Remote Control action"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Zoom Out"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "Move the currently selected members down"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5287,12 +5179,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "Load Selection"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy
 msgid "Warning: ignoring exception because task was cancelled. Exception was: "
-msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70
@@ -5322,7 +5212,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "Change location"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6460,5 +6349,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Geotagged Images"
@@ -6484,5 +6373,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6501,5 +6390,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG images (*.jpg)"
@@ -6537,43 +6426,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "gps point"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Customise line drawing"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Use global settings."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Draw lines between points for this layer."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Do not draw lines between points for this layer."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Select line drawing options"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Customise Colour"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6581,6 +6470,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6654,10 +6543,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Convert to data layer"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6668,11 +6557,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6681,29 +6570,29 @@
 msgstr "Converted from: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr "Download from OSM along this track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "Download everything within:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metres"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "Maximum area per request:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} sq km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6714,9 +6603,9 @@
 "wish<br>to continue?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 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:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6726,5 +6615,5 @@
 "the end were omitted or moved to the start."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6776,5 +6665,5 @@
 msgstr "Convert to GPX layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6799,5 +6688,5 @@
 msgstr[1] "tracks"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6805,5 +6694,5 @@
 msgstr[1] "points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6812,5 +6701,5 @@
 msgstr[1] "a track with {0} points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6819,5 +6708,5 @@
 msgstr[1] "{0} consists of {1} tracks"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6826,9 +6715,9 @@
 msgstr[1] "{0} points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "gps marker"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6836,5 +6725,5 @@
 msgstr[1] "markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6843,9 +6732,9 @@
 msgstr[1] "{0} consists of {1} markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "Synchronise Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -6853,5 +6742,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:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6859,14 +6748,14 @@
 msgstr "Audio synchronised at point {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 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:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 msgid "Make Audio Marker at Play Head"
 msgstr "Make Audio Marker at Play Head"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6876,13 +6765,13 @@
 "marker."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 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:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Show/Hide Text/Icons"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Toggle visible state of the marker text and icons."
@@ -7514,7 +7403,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
-#, fuzzy
 msgid "JOSM Plugin description URL"
-msgstr "Add JOSM Plugin description URL."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
@@ -7936,7 +7824,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8008,4 +7896,9 @@
 msgstr "Preparing data..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "Could not read \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -8017,7 +7910,69 @@
 msgstr "Could not read \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "GPX Files"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "gps track description"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Add author information"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Real name"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Copyright (URL)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Predefined"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "Copyright year"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Keywords"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Export options"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "Export and Save"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Error while exporting {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Choose a predefined licence"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -8045,4 +8000,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Parse error: invalid document structure for gpx document"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Unknown role ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8180,7 +8140,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "Scanning directory {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8195,4 +8155,5 @@
 msgstr "The server replied an error with code {0}"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8224,4 +8185,32 @@
 msgstr "Login"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "OSM Server Files"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8285,30 +8274,26 @@
 msgstr "Error during parse."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "OSM Server Files"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Unknown version"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr "Version number missing from OSM data"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr "Unknown version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr "Found <nd> element in non-way."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "<nd> has zero ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "Found <member> element in non-relation."
@@ -8359,5 +8344,5 @@
 msgstr "Missing required attribute \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8366,9 +8351,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "Unknown member type for ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "Prepare OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "Ill-formed node id"
@@ -8494,9 +8484,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
-"Warning - loading of {0} plugin was requested. This plugin is no longer "
-"required."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8587,7 +8575,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "No plugin information found."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8976,23 +8963,23 @@
 msgstr "Found null file in directory {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Error while getting files from directory {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr "Correlate to GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} were found to be gps tagged."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "Open images with AgPifoJ..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9244,5 +9231,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Error loading file"
@@ -9291,30 +9278,13 @@
 msgstr "Select Tableau d'Assemblage"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr "Auto sourcing"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr "Invalid projection"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr "Change the projection to {0} first."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-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"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9326,9 +9296,9 @@
 "Would you like to restore F11 for grab action ?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr "Restore grab shortcut F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM is stopped for the change to take effect."
@@ -9500,13 +9470,23 @@
 msgstr "Extract building footprints"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr "Download Image from French Cadastre WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Cadastre: {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+#, fuzzy
+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 JOSM projection to Lambert and restart"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9575,5 +9555,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr "Adjust WMS"
@@ -10300,22 +10280,27 @@
 msgstr "Could not acquire image"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr "Connecting"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr "Connected"
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr "Not connected"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr "Connection Failed"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "name"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10348,32 +10333,32 @@
 msgstr "LiveGPS layer"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
 msgstr "Capture GPS Track"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr "Connect to gpsd server and show current position in LiveGPS layer."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center Once"
 msgstr "Centre Once"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center the LiveGPS layer to current position."
 msgstr "Centre the LiveGPS layer to current position."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr "Auto-Centre"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Continuously centre the LiveGPS layer to current position."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -10623,24 +10608,24 @@
 msgstr "Permitted actions"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Remote Control has been asked to load data from the API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr "Request details: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr "Do you want to allow this?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr "Confirm Remote Control action"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Remote Control has been asked to import data from the following URL:"
@@ -10879,10 +10864,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
+#, fuzzy, java-format
+msgid "{0} start"
 msgstr "start"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr "end"
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} node"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11419,10 +11406,10 @@
 msgstr "Crossing ways"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr "Duplicated nodes"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "This test checks that there are no nodes at the very same location."
@@ -12113,9 +12100,33 @@
 msgstr "No valid WMS URL or id"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr "Adjust the position of the selected WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "Please select the row to edit."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "Save WMS layer"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Start adjusting"
+msgstr "Start routing"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "No changes to upload."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -12130,15 +12141,15 @@
 msgstr "Automatic downloading"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS layer ({0}), automatically downloading in zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS layer ({0}), downloading in zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12146,42 +12157,42 @@
 "The requested area is too big. Please zoom in a little, or change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Download visible tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Reload erroneous tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Save WMS layer to file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr "Save WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "Load WMS layer from file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr "Load WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Unsupported WMS file version; found {0}, expected {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "File Format Error"
@@ -12807,5 +12818,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -15362,5 +15373,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15662,5 +15673,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15763,5 +15774,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -20387,7 +20398,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "Motorroad"
+msgstr ""
 
 #. color tertiary
@@ -23566,5 +23576,5 @@
 msgstr "Village/City"
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23575,5 +23585,5 @@
 msgstr "One Way"
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23583,5 +23593,5 @@
 msgstr "Church"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23592,5 +23602,5 @@
 msgstr "Fuel Station"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23601,5 +23611,5 @@
 msgstr "Shopping"
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23609,5 +23619,5 @@
 msgstr "WC"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23840,34 +23850,99 @@
 msgstr "Terraserver Urban"
 
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Failed to initialise API. Please try again later."
-
-#~ msgid "API initialization failed"
-#~ msgstr "API initialisation failed"
+#~ msgid "Unknown file extension."
+#~ msgstr "Unknown file extension."
+
+#~ msgid "Move"
+#~ msgstr "Move"
+
+#~ msgid "Invalid projection"
+#~ msgstr "Invalid projection"
+
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Change the projection to {0} first."
+
+#~ msgid "end"
+#~ msgstr "end"
+
+#~ msgid "Data Layer"
+#~ msgstr "Data Layer"
+
+#~ msgid "Not implemented yet."
+#~ msgstr "Not implemented yet."
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Resolve Conflicts"
+
+#~ msgid "Object"
+#~ msgstr "Object"
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "There were conflicts during import."
+
+#~ 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 "Aborting..."
+#~ msgstr "Aborting..."
+
+#~ msgid "position"
+#~ msgstr "position"
+
+#~ msgid "different"
+#~ msgstr "different"
+
+#~ msgid "true"
+#~ msgstr "true"
+
+#~ msgid "false"
+#~ msgstr "false"
+
+#~ msgid "Resolve {0} conflicts in {1} objects"
+#~ msgstr "Resolve {0} conflicts in {1} objects"
+
+#~ msgid "Change"
+#~ msgstr "Change"
+
+#~ msgid "unnamed"
+#~ msgstr "unnamed"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} object has conflicts:"
+#~ msgstr[1] "{0} objects have conflicts:"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Click Reload to refresh list"
+
+#~ msgid "Date"
+#~ msgstr "Date"
+
+#~ msgid "Revert"
+#~ msgstr "Revert"
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
 #~ msgstr ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-
-#~ msgid "No data"
-#~ msgstr "No data"
-
-#~ msgid "Update failed"
-#~ msgstr "Update failed"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Missing primitive"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Apply partial resolutions"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Layers: {0}"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Remove the member in the current table row from this relation"
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+
+#~ msgid "Email"
+#~ msgstr "E-Mail"
+
+#~ msgid "Navigation"
+#~ msgstr "Navigation"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM username (e-mail)"
 
 #~ msgid ""
@@ -23878,91 +23953,4 @@
 #~ "about the problem."
 
-#~ msgid "Validate"
-#~ msgstr "Validate"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Validate either current selection or complete dataset."
-
-#~ msgid "Data Layer"
-#~ msgstr "Data Layer"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Not implemented yet."
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Resolve Conflicts"
-
-#~ msgid "Object"
-#~ msgstr "Object"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "There were conflicts during import."
-
-#~ 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 "Aborting..."
-#~ msgstr "Aborting..."
-
-#~ msgid "position"
-#~ msgstr "position"
-
-#~ msgid "different"
-#~ msgstr "different"
-
-#~ msgid "true"
-#~ msgstr "true"
-
-#~ msgid "false"
-#~ msgstr "false"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Resolve {0} conflicts in {1} objects"
-
-#~ msgid "Change"
-#~ msgstr "Change"
-
-#~ msgid "unnamed"
-#~ msgstr "unnamed"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} object has conflicts:"
-#~ msgstr[1] "{0} objects have conflicts:"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Click Reload to refresh list"
-
-#~ msgid "Date"
-#~ msgstr "Date"
-
-#~ msgid "Revert"
-#~ msgstr "Revert"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-
-#~ msgid "Email"
-#~ msgstr "E-Mail"
-
-#~ msgid "Navigation"
-#~ msgstr "Navigation"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM username (e-mail)"
-
 #~ msgid ""
 #~ "Server returned internal error. Try a reduced area or retry after waiting "
@@ -23999,4 +23987,7 @@
 #~ 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 "Error parsing server response."
 #~ msgstr "Error parsing server response."
@@ -24055,4 +24046,10 @@
 #~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
 #~ "move mouse.   Select: Click."
+
+#~ msgid "Validate"
+#~ msgstr "Validate"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Validate either current selection or complete dataset."
 
 #~ msgid "image not loaded"
@@ -24180,4 +24177,7 @@
 #~ "{0}"
 
+#~ msgid "Layers: {0}"
+#~ msgstr "Layers: {0}"
+
 #~ msgid "Conflicts: {0}"
 #~ msgstr "Conflicts: {0}"
@@ -24242,4 +24242,11 @@
 #~ 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 "Directly load TCX files from JOSM."
@@ -24254,7 +24261,4 @@
 #~ "GPX track. This plugin can be used to prepare tracks for uploading to OSM "
 #~ "eg. deleting uninteresting parts of track."
-
-#~ msgid "Start routing"
-#~ msgstr "Start routing"
 
 #~ msgid "Remove route nodes"
@@ -24345,4 +24349,7 @@
 #~ msgstr "WARNING: unexpected value for preference conflict.resolution, got "
 
+#~ msgid "Apply partial resolutions"
+#~ msgstr "Apply partial resolutions"
+
 #~ msgid ""
 #~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
@@ -24369,4 +24376,7 @@
 #~ msgstr "Undeleting Way..."
 
+#~ msgid "Missing primitive"
+#~ msgstr "Missing primitive"
+
 #~ msgid "Keep mine"
 #~ msgstr "Keep mine"
@@ -24377,4 +24387,7 @@
 #~ msgid "Delete mine"
 #~ msgstr "Delete mine"
+
+#~ msgid "Update failed"
+#~ msgstr "Update failed"
 
 #~ msgid ""
@@ -24396,4 +24409,13 @@
 #~ msgstr "Didn't find an historized primitive with id {0} in this dataset"
 
+#~ msgid "Failed to initialize API. Please try again later."
+#~ msgstr "Failed to initialise API. Please try again later."
+
+#~ msgid "API initialization failed"
+#~ msgstr "API initialisation failed"
+
 #~ msgid "image loading..."
 #~ msgstr "image loading..."
+
+#~ msgid "No data"
+#~ msgstr "No data"
Index: /applications/editors/josm/i18n/po/es.po
===================================================================
--- /applications/editors/josm/i18n/po/es.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/es.po	(revision 16973)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-07-31 18:24+0000\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-04 11:10+0000\n"
 "Last-Translator: cdavila <cdavilam@jemila.jazztel.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -16,13 +16,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:34+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -47,15 +40,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -80,7 +65,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -88,4 +73,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -107,8 +96,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Error"
@@ -119,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Cambios no guardados"
@@ -137,16 +128,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -158,13 +148,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -181,4 +172,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "Cancelar"
@@ -192,5 +184,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -199,5 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -208,23 +201,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -245,5 +238,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Advertencia"
@@ -277,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -308,5 +301,5 @@
 msgstr "Informe de errores"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -369,19 +362,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Por favor, seleccione la fila a borrar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Selecione alguno:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "Unir nodos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -420,5 +410,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -451,18 +441,18 @@
 msgstr "Longitud"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Alinear nodos en círculo"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Mover los nodos seleccionados a un círculo"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -491,18 +481,18 @@
 msgstr "Herramienta: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Por favor, selecciona al menos cuatro nodos."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -515,5 +505,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -642,13 +632,13 @@
 msgstr "Combinar varias vías en una."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Por favor, selecciona al menos dos vías para combinar."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "¿Combinar vías con diferentes relaciones?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -657,13 +647,13 @@
 "Las vías seleccionadas tienen diferentes relaciones. ¿Aún quiere combinarlas?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "Combinar de todos modos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "¿Cambiar direcciones?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -673,9 +663,9 @@
 "alguna de ellas?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Invertir y combinar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -684,5 +674,5 @@
 msgstr "Introduzca valores para todos los conflictos."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -690,14 +680,14 @@
 msgstr "Resolver conflictos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combinar {0} vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "Todas la vías están vacías"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -716,24 +706,23 @@
 msgstr "Copia los objetos seleccionados al portapapeles"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Por favor, seleccione algo que copiar."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Crear círculo"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Crear un círculo a partir de tres nodos."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "Esos nodos no están en un círculo."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -747,8 +736,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -768,15 +757,15 @@
 msgstr "Eliminar objetos seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Sobrescribir"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "El archivo existe. ¿Sobrescribir?"
@@ -839,5 +828,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -847,7 +836,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "Errores durante la descarga"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -858,5 +846,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Duplicar"
@@ -880,92 +869,36 @@
 msgstr "Salir de la aplicación"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Nota: GPL no es compatible con la licencia de OSM. No subas trazas con "
-"licencia GPL."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Exportar a GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Exportar los datos a archivo GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Nada que exportar. Obtén algunos datos primero"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr "el parametro \"{0}\" no debe ser nulo"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr "Se esperaba instancia de OsmDataLayer o GpxLayer. Obtenida \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "Descripción de la traza GPS"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Añadir información del autor"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Nombre real"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr "Correo electrónico"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Derechos de autor (URL)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Predefinido"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "Año del copyright"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Palabras claves"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Opciones de exportación"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "Exportar y guardar"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Error mientras se exportaba {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Elegir una licencia predefinida"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "Exportar los datos a archivo GPX"
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -981,6 +914,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1055,5 +988,5 @@
 msgstr "Unir un nodo al segmento de vía más cercano"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "Unir nodo y línea"
@@ -1064,12 +997,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Unir de todos modos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "Unir la capa inmediatamente inferior con la capa selecionada."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1115,12 +1046,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "selección"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Actualiza las primitivas seleccionadas actualmente desde el servidor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1180,5 +1109,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "Nuevo"
@@ -1254,5 +1183,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
-#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1260,7 +1188,4 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 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?"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1274,5 +1199,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Pegar"
@@ -1284,5 +1209,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Pegar etiquetas"
@@ -1331,7 +1256,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "No se ha podido cambiar el nombre del archivo \"{0}\"."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1368,5 +1293,10 @@
 msgstr "El archivo {0} existe. ¿Sobrescribir?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "No se encontró ninguna intersección. Nada ha cambiado."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1376,25 +1306,25 @@
 "favor comunique esto como fallo."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "Ningún documento abierto luego nada por grabar."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Documento vacío"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "El documento no contiene datos."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "Guardar igualmente"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Conflictos"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1404,59 +1334,19 @@
 "gestionarán como si rechazara todo. ¿Continuar?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "Rechazar conflictos y guardar"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "Guardar el archivo OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "Guardar el archivo GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "Guardar capa"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "No se pudo salvaguardar el archivo."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Extensión de archivos desconocida: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr ""
-"<html>Ocurrió un error mientras se comunicaba con el servidor<br>Detalles: "
-"{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr "Ocurrió un error al restaurar el archivo de salvaguarda."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Extensión de archivo desconocida."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "Ocurrió un error al guardar."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr "Ocurrió un error al restaurar el archivo de salvaguarda."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1571,24 +1461,17 @@
 "nodos de la mitad de la vía)."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
 "should verify this and correct it when necessary.</html>"
 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."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
-#, fuzzy
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
 "this and correct it when necessary.</html>"
 msgstr ""
-"Una relación de miembros se ha copiado a todas las nuevas vías.\n"
-"Debes verificar y corregir esta cuando sea necesario."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1726,14 +1609,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
-#, fuzzy
 msgid "No current dataset found"
-msgstr "No se encontró la capa de datos GPX"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
-#, fuzzy
 msgid "Didn't find a 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"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
@@ -1858,7 +1737,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "Subir todos los cambios al servidor OSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -2016,12 +1894,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "Subiendo datos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr "Se han producido los siguientes errores durante la descarga masiva:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -2067,5 +1944,5 @@
 msgstr "Modo: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2075,6 +1952,6 @@
 "los nodos sin usar al borrar una vía. Con Ctrl: borrar los objetos referidos."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2085,8 +1962,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2131,38 +2008,38 @@
 msgstr "seleccionado"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "No se puede añadir un nodo fuera del mundo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Añadir nodo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Añadir nodo a la vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "Conectar la vía existente al nodo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Añadir un nodo nuevo a una vía existente"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "Añadir un nodo a la vía y conectar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "Crear un nodo nuevo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "Seleccionar el nodo bajo el cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2171,14 +2048,14 @@
 msgstr[1] "Insertar un nuevo nodo en {0} vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "Comenzar una nueva vía desde el último nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "Continuar la vía desde el último nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "Finalizar dibujo."
@@ -2198,5 +2075,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2209,5 +2086,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "Soltar el botón del ratón para parar de rotar."
@@ -2245,9 +2122,9 @@
 msgstr[1] "Añadir y mover un nuevo nodo virtual a {0} vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr "Mover elementos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2260,13 +2137,13 @@
 "¿Quiere moverlos realmente?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr "Moverlos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr "Deshacer mover"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2275,5 +2152,5 @@
 "más cercano."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2511,26 +2388,26 @@
 "relación"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Credencial de autentificación inexperada: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr "No se encuentran los argumentos de or"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr "No se encuentran los argumentos de not"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "Se esperaba un cierre de paréntesis."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Número de parámetros incorrecto para el operador de nodos."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2541,5 +2418,5 @@
 "número de nodos o un intervalo, por ejemplo nodos:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2629,23 +2506,22 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Resolver conflicto"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
 "primitmive ''{1}''"
-msgstr "ya se ha registrado un conflicto para la primitiva \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "No se encontraron coincidencias para \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2692,5 +2568,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "Borrar de la relación"
@@ -2705,5 +2581,5 @@
 "¿Borrar de la relación?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr "Dividir segmento de vía"
@@ -2711,5 +2587,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2721,8 +2598,7 @@
 "usándolos.<br>¿Esta seguro que quiere borrarlo?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "Borrar de la relación"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2732,9 +2608,228 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Mover"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "Unir {0} nodos"
+msgstr[1] "Unir {0} nodos"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr "Purgando 1 primitiva"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr "eliminando referencia de la vía {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+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}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr "eliminando referencia de la relación {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr "Resolver conflictos en la lista de miembros de la relación {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr "Eliminando miembro de relación {0} {1}"
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "Rotar {0} {1}"
+msgstr[1] "Rotar {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Secuencia"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "Resolver {0} conflictos de etiquetas en {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr "Deshacer borrado de {0} primitivas"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr "Resolver conflictos de versión para {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr "Resolver conflictos en la lista de nodos de la vía {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr "El conjunto de datos principal no incluye el nodo {0}"
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "¿Aplicar?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"Al modificar el sentido de esta vía se sugieren los siguientes cambios en "
+"las propiedades de la vía y sus nodos con el fin de mantener la consistencia "
+"de los datos."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Relación"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Rol antiguo"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "Rol nuevo"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Clave antigua"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Valor anterior"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Clave nueva"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "Nuevo valor"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Aplicar los cambios seleccionados"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "No aplicar cambios"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "Por favor, seleccione qué cambios de propiedades desea aplicar."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Propiedades de "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr "Roles en la relaciones referidos a"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Correción automática de etiquetas"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Archivo de configuración malformado en las lineas {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "No se puede abrir el directorio de preferencias: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+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}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Preferencias guardadas en {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "No se han podido subir las preferencias. Ya que: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "No se han podido cargar las preferencias desde el servidor."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr "ya se ha registrado un conflicto para la primitiva \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "Grados decimales"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "Grados minutos segundos"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "O"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "E"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "Cambiar {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr "parámetro {0} > 0 necesario. Obtenido {1}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "incompleto"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2748,215 +2843,4 @@
 msgstr[1] "nodos"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr "Purgando 1 primitiva"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr "eliminando referencia de la vía {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-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}"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr "eliminando referencia de la relación {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr "Resolver conflictos en la lista de miembros de la relación {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr "Eliminando miembro de relación {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr "Rotar {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Secuencia"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "Resolver {0} conflictos de etiquetas en {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr "Deshacer borrado de {0} primitivas"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "Resolver conflictos de versión para {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr "Resolver conflictos en la lista de nodos de la vía {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr "El conjunto de datos principal no incluye el nodo {0}"
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "¿Aplicar?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"Al modificar el sentido de esta vía se sugieren los siguientes cambios en "
-"las propiedades de la vía y sus nodos con el fin de mantener la consistencia "
-"de los datos."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "Relación"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "Rol antiguo"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "Rol nuevo"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Clave antigua"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Valor anterior"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Clave nueva"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "Nuevo valor"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "Aplicar los cambios seleccionados"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "No aplicar cambios"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "Por favor, seleccione qué cambios de propiedades desea aplicar."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "Propiedades de "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr "Roles en la relaciones referidos a"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "Correción automática de etiquetas"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Archivo de configuración malformado en las lineas {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "No se puede abrir el directorio de preferencias: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-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}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Preferencias guardadas en {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "No se han podido subir las preferencias. Ya que: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "No se han podido cargar las preferencias desde el servidor."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr "ya se ha registrado un conflicto para la primitiva \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "Grados decimales"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "Grados minutos segundos"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "O"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "E"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "parámetro {0} > 0 necesario. Obtenido {1}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "incompleto"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2988,5 +2872,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -3019,5 +2903,5 @@
 msgstr "el paremetro \"{0}\" no es una clase aceptable, obtenido \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -3026,22 +2910,22 @@
 msgstr[1] "miembros {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "vía"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "ferrocarril"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "vía fluvial"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "uso del suelo"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -3110,10 +2994,12 @@
 msgstr "La vía multipoligonal ''{0}'' no está cerrada."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "Miembro vacío en la relación."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3121,5 +3007,5 @@
 msgstr "Miembro ''{0}'' borrado en la relación."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3127,57 +3013,57 @@
 msgstr "Vía ''{0}''  con menos de dos puntos."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr "Se ha encontrado más de una vía \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr "Se ha encontrado más de una vía \"a\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr "Se ha encontrado más de un elemento \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Rol ''{0}'' desconocido."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo de miembro \"{0}\" desconocido."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr "No se ha encontrado ninguna vía \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr "No se ha encontrado ninguna vía \"a\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr "No se ha encontrado ningún nodo o vía con el rol \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 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\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 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\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 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\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 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\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3229,5 +3115,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3264,4 +3150,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3301,13 +3191,25 @@
 msgstr "UTM Zona {0}"
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "No pudieron leerse los marcadores."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "No pudieron escribirse los marcadores."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3345,4 +3247,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3374,16 +3277,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "Excepción inesperada"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
 msgstr ""
-"No se ha podido conectar con el servidor OSM. Por favor, verifique su "
-"conexión a Internet."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3392,5 +3292,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -3398,6 +3298,4 @@
 "preferences and your internet connection.</html>"
 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."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
@@ -3617,6 +3515,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3645,39 +3543,39 @@
 msgstr "Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "Mover hacia la derecha"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Mapa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "Mover hacia la izquierda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Mover hacia arriba"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Mover hacia abajo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "Ampliar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Reducir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "escalar"
@@ -3711,10 +3609,10 @@
 msgstr "(sin objeto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "capa no listada"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3798,12 +3696,12 @@
 msgstr "el rol {0} no participa en la pareja de comparación {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3812,6 +3710,6 @@
 msgstr "Etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3819,30 +3717,30 @@
 msgstr "Nodos"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "Ningún conflito de etiqueta pendiente de ser resuelto"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Etiquetas ({0} conflictivas)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} etiquetas conflictivas pendientes de ser resueltas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Nodos (resueltos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
@@ -3851,17 +3749,17 @@
 "lista de nodos de esta vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Nodos (con conflictos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "Conflictos pendientes en la lista de nodos de esta vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Miembros (resueltos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3871,25 +3769,25 @@
 "lista de miembros de esta relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Miembros (con conflictos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Conflictos pendientes en la lista de miembros de esta relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr "Ningún conflicto de propiedades pendiente"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Propiedades (con conflictos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr "Conflictos de propiedades pendientes de resolver"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Resolución de conflictos"
@@ -4114,8 +4012,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4354,5 +4252,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4365,5 +4263,5 @@
 msgstr "Primitiva"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4399,6 +4297,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4411,6 +4309,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4484,7 +4382,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4550,7 +4448,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Continuar de todos modos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4577,7 +4474,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Resolver conflictos de versión para {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4628,99 +4525,92 @@
 msgstr "Mostrando el historial de la primitiva seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Capas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Abrir un listado de todas las capas cargadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Borrar la capa seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "Hay cambios sin guardar. ¿Eliminar la capa de todas formas?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "Eliminar capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "¿Realmente quiere borrar toda la capa?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Información"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "sí"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Borrar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "Borrar {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Mostrar/Ocultar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Cambia estado de visibilidad de la capa seleccionada."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "privado"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "Borrar la capa seleccionada"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "Unir la capa inmediatamente inferior con la capa selecionada."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Mover la capa seleccionada una fila arriba"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Mover la capa seleccionada una fila abajo"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "Panel informativo"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4729,22 +4619,22 @@
 msgstr[1] "Esto cambiará {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "Un valor vacío elimina la clave."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "¿Modificar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4752,5 +4642,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4759,50 +4649,41 @@
 msgstr[1] "Cambiar las propiedades de hasta {0} objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Por favor, selecciona una etiqueta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Por favor, selecciona un valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 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/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "Propiedades/Relaciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Propiedades de los objetos seleccionados."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "Miembro de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "Cambiar relación"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, 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/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "Añadir propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4819,63 +4700,77 @@
 msgstr "Añadir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 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/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "Editar propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 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/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Propiedades: {0} / Miembros: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "Propiedades / Miembros"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "Cambiar relación"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, 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/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "Borrar la clave seleccionada en todos los objetos"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "Eliminar propiedades"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "Borrar la clave seleccionada en todos los objetos"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Propiedades: {0} / Miembros: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "Propiedades / Miembros"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Relaciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "Abrir una lista de todas las relaciones."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaciones: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Abrir un editor para la relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Borrar la relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Crear un anueva relación"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4906,5 +4801,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4974,31 +4869,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
-#, fuzzy
 msgid "Download all child relations (recursively)"
-msgstr "Descargar relación de miembros"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "Descargar área"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "Borrar la relación seleccionada"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Descargar las teselas visibles"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr "Descargar relación de miembros"
@@ -5017,17 +4908,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "No se seleccionó ninguna relación"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "Descargando complemento {0}..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5045,7 +4935,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "Relaciones"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -5056,9 +4945,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5067,15 +4956,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "Eliminar elementos de las relaciones"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -5085,9 +4973,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -5097,15 +4985,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5113,5 +5001,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5119,66 +5007,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
+msgid "Remove all members referring to one of the selected primitives"
+msgstr ""
+
+#. putValue(NAME, tr("Remove Selected"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Relation Editor: Remove Selected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #, fuzzy
-msgid "Remove all members referring to one of the selected primitives"
-msgstr "Fallo al actualizar las primitivas seleccionadas."
-
-#. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
-msgid "Relation Editor: Remove Selected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Select primitives for selected relation members"
+msgstr "Borrar la relación seleccionada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "Mover los miembro(s) seleccionos hacia arriba"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "Mover los miembros seleccionados hacia abajo"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Eliminar todos los objetos seleccionados de la relación"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "Borrar la relación seleccionada"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr "Continuar resolviendo"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5187,10 +5089,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "Conflictos en dato"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -5199,21 +5100,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Guardar los datos actuales."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5223,37 +5123,37 @@
 msgstr "Aceptar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr "Cancelar las actualizaciones y cerrar el cuadro de diálogo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Descargar todas las vías y nodos incompletos de esta relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "Descargar miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr "Aplicar rol"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5263,32 +5163,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
-msgstr "Sí, purgarlo"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
-msgstr "confirmar la acción del control remoto"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Alejar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "Mover los miembros seleccionados hacia abajo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5349,7 +5241,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "Cargar selección"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -5383,7 +5274,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "Cambiar localización"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6519,5 +6409,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Imagenes Geoetiquetadas"
@@ -6543,5 +6433,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6560,5 +6450,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "Imágenes JPEG (*.jpg)"
@@ -6596,43 +6486,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "punto GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Personalice el dibujo de línea"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Usar las preferencias globales"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Dibujar las líneas entre puntos en esta capa"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "No dibujar las líneas entre puntos en esta capa"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Seleccione las opciones de dibujo de línea"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Personalizar colores"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6640,6 +6530,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6713,10 +6603,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Convertir en capa de datos"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6727,11 +6617,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces (EN)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6740,29 +6630,29 @@
 msgstr "Convertido desde: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 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:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "Descargar todo entre:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "Área máxima por petición:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6773,9 +6663,9 @@
 "<br¿Desea continuar?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 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:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6786,5 +6676,5 @@
 "comienzo."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6836,5 +6726,5 @@
 msgstr "Convertir a capa de gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6859,5 +6749,5 @@
 msgstr[1] "pistas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6865,5 +6755,5 @@
 msgstr[1] "puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6872,5 +6762,5 @@
 msgstr[1] "una traza con {0} puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6879,5 +6769,5 @@
 msgstr[1] "{0} formado por las trazas {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6886,9 +6776,9 @@
 msgstr[1] "{0} puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "Marcador gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6896,5 +6786,5 @@
 msgstr[1] "marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6903,9 +6793,9 @@
 msgstr[1] "{0} consiste en los marcadores {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "Sincronizar audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -6913,5 +6803,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:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6919,14 +6809,14 @@
 msgstr "Audio sincronizado en el punto {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 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:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 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:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6936,13 +6826,13 @@
 "marcador."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 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:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Mostrar/Esconder Texto/Iconos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
@@ -7594,7 +7484,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
-#, fuzzy
 msgid "JOSM Plugin description URL"
-msgstr "Añadir URL de la descripción del componente de JOSM"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
@@ -8013,7 +7902,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8085,4 +7974,9 @@
 msgstr "Preparando datos..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "No se pudo leer \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -8094,7 +7988,69 @@
 msgstr "No se pudo leer \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Nota: GPL no es compatible con la licencia de OSM. No subas trazas con "
+"licencia GPL."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "Archivos GPX"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "Descripción de la traza GPS"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Añadir información del autor"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Nombre real"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr "Correo electrónico"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Derechos de autor (URL)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Predefinido"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "Año del copyright"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Palabras claves"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Opciones de exportación"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "Exportar y guardar"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Error mientras se exportaba {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Elegir una licencia predefinida"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -8124,4 +8080,9 @@
 "Error en el análisis sintáctico: estructura de documento invalida para un "
 "documento gpx"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Rol ''{0}'' desconocido."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8256,7 +8217,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "Escaneando directorio {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8271,4 +8232,5 @@
 msgstr "El servidor responde con un error con código {0}"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8300,4 +8262,32 @@
 msgstr "Inicio de sesión"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "Archivos del servidor OSM"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, fuzzy, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr "Se esperaba instancia de OsmDataLayer o GpxLayer. Obtenida \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8367,30 +8357,26 @@
 msgstr "Error durante el análisis sintáctico."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "Archivos del servidor OSM"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Versión desconocida"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr "Falta número de versión en los datos OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr "Versión desconocida: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr "Encontrado elemento <nd> en una no Vía"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "<nd> no tiene ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "Encontrada una etiqueta <miembro> fuera de una relación."
@@ -8445,5 +8431,5 @@
 msgstr "Falta el atributo necesario \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8452,9 +8438,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "Tipo de miembro \"{0}\" desconocido."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "Preparando datos OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "id del nodo mal formado"
@@ -8580,9 +8571,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
-"Advertencia - Se a requerido la carga del complemento {0} . Este complemento "
-"ya no es necesario."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8678,7 +8667,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "No se ha encontrado información del complemento."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -9071,23 +9059,23 @@
 msgstr "Encontrado archivo nulo en el directorio {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Error mientras se obtenían archivos del directorio {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr "Correlacionar con GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "Se encontraron {0} geoetiquetadas."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "abrir imágenes con AgPifoJ..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9341,5 +9329,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Error al leer el archivo"
@@ -9388,30 +9376,13 @@
 msgstr "Seleccione tabla de montaje"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr "Catastro"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr "Digitalización automática"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr "Proyección inválida"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr "Cambia la proyección a {0} previamente."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-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"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9420,9 +9391,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM está detenido para que el cambio surta efecto."
@@ -9605,13 +9576,23 @@
 msgstr "Estraer las huellas de los edificios"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr "Descargando imágenes desde el servidor francés WMS del Catastro"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Catastro: {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+#, fuzzy
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
+msgstr ""
+"Para activar el componente WMS Catastro cambie\n"
+"la proyección de JOSM a Lambert y reinicie la aplicación"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9682,5 +9663,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr "Ajustar WMS"
@@ -10412,22 +10393,27 @@
 msgstr "No se a podido adquirir la imagen"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr "Conectado"
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr "No conectado"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr "Falló la conexión"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "nombre"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10460,33 +10446,33 @@
 msgstr "Capa LiveGPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
 msgstr "Capturar traza GPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 "Conectar al servidor gpsd y mostrar la posición actual en la capa LiveGPS."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center Once"
 msgstr "Centrar una vez"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center the LiveGPS layer to current position."
 msgstr "Centrar la capa LiveGPS a la posición actual."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr "Autocentrar"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Centrar continuamente la capa LiveGPS a la posición actual."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -10740,24 +10726,24 @@
 msgstr "Acciones permitidas"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr "El control remoto ha pedido cagar datos desde el API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detalles requeridos: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr "¿Desea permitir esto?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr "confirmar la acción del control remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "El control remoto ha pedido importar datos de la siguiente URL:"
@@ -10998,10 +10984,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
+#, fuzzy, java-format
+msgid "{0} start"
 msgstr "comenzar"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr "fin"
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} nodo"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11548,10 +11536,10 @@
 msgstr "Cruce de vías"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr "Nodos duplicados"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Esta examen comprueba que no haya nodos en el mismo lugar."
@@ -12236,9 +12224,33 @@
 msgstr "URL o id de WMS no válida"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr "Ajustar la posición de la capa WMS seleccionada"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "Por favor, seleccione la fila a editar"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "Salvar capa WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Start adjusting"
+msgstr "Iniciar enrutamiento"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "Ningún cambio que subir"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -12254,15 +12266,15 @@
 msgstr "Descarga automática"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Capa WMS ({0}) descargándose automáticamente en el zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Capa WMS ({0}), descargando en zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12271,42 +12283,42 @@
 "o cambe la resolución"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Descargar las teselas visibles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Cambiar resolución"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Recargar teselas erróneas"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Canal alfa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Guardar capa WMS como archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr "Salvar capa WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "Cargar capa WMS desde archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr "Cargar capa WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Versión de archivo WMS no soportada; encontrada {0}, esperada {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Error en el formato del archivo"
@@ -12952,5 +12964,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -15508,5 +15520,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15808,5 +15820,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15909,5 +15921,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -20540,7 +20552,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "Autovía"
+msgstr ""
 
 #. color tertiary
@@ -23719,5 +23730,5 @@
 msgstr "Población/Ciudad"
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23728,5 +23739,5 @@
 msgstr "Sentido único"
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23736,5 +23747,5 @@
 msgstr "Iglesia"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23745,5 +23756,5 @@
 msgstr "Gasolinera"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23754,5 +23765,5 @@
 msgstr "Compras"
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23762,5 +23773,5 @@
 msgstr "Baño"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23993,52 +24004,18 @@
 msgstr "Terraserver Urban"
 
-#~ 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 ""
-#~ "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 "No data"
-#~ msgstr "Sin datos"
-
-#~ msgid "Update failed"
-#~ msgstr "Actualización fallida"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Falta la primitiva"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Aplicar resolución parcial"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Capas: {0}"
-
-#~ msgid "Conflict created"
-#~ msgstr "Conflicto creado"
-
-#~ 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 ""
-#~ "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 "Validate"
-#~ msgstr "Validar"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Validar la selección actual o el conjunto de datos completado"
+#~ msgid "Unknown file extension."
+#~ msgstr "Extensión de archivo desconocida."
+
+#~ msgid "Move"
+#~ msgstr "Mover"
+
+#~ msgid "Invalid projection"
+#~ msgstr "Proyección inválida"
+
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Cambia la proyección a {0} previamente."
+
+#~ msgid "end"
+#~ msgstr "fin"
 
 #~ msgid "Email"
@@ -24243,4 +24220,7 @@
 #~ "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 "Validate"
+#~ msgstr "Validar"
 
 #~ msgid ""
@@ -24301,4 +24281,7 @@
 #~ "\n"
 #~ "{0}"
+
+#~ msgid "Layers: {0}"
+#~ msgstr "Capas: {0}"
 
 #~ msgid "Conflicts: {0}"
@@ -24426,6 +24409,10 @@
 #~ msgstr "Oberpfalz Geofabrik.de"
 
-#~ msgid "Start routing"
-#~ msgstr "Iniciar enrutamiento"
+#~ 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 "Remove route nodes"
@@ -24501,9 +24488,25 @@
 #~ 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 "Undeleting relation..."
 #~ msgstr "Deshaciando borrado de relación..."
 
+#~ msgid "Update failed"
+#~ msgstr "Actualización fallida"
+
 #~ msgid "Selection too big"
 #~ msgstr "Selección demasiado grande"
+
+#~ msgid "Missing primitive"
+#~ msgstr "Falta la primitiva"
+
+#~ msgid "Apply partial resolutions"
+#~ msgstr "Aplicar resolución parcial"
 
 #~ msgid "Keep mine"
@@ -24543,7 +24546,21 @@
 #~ "de {1} primitivos.</html>"
 
+#~ 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 "Data Layer"
 #~ msgstr "Capa de datos"
 
+#~ 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 "Validate either current selection or complete dataset."
+#~ msgstr "Validar la selección actual o el conjunto de datos completado"
+
 #~ msgid "WGS84 Geographisch"
 #~ msgstr "WGS84 Geográfico"
@@ -24560,2 +24577,8 @@
 #~ msgid "image loading..."
 #~ msgstr "cargando imagen..."
+
+#~ msgid "No data"
+#~ msgstr "Sin datos"
+
+#~ msgid "Conflict created"
+#~ msgstr "Conflicto creado"
Index: /applications/editors/josm/i18n/po/et.po
===================================================================
--- /applications/editors/josm/i18n/po/et.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/et.po	(revision 16973)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-07-29 21:28+0000\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-10 09:22+0000\n"
 "Last-Translator: Margus Värton <margus@dakar.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,13 +16,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:34+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -47,15 +40,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -80,7 +65,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -88,4 +73,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -107,8 +96,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Viga"
@@ -119,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Salvestamata muudatused"
@@ -137,16 +128,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -158,13 +148,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -181,6 +172,7 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
-msgstr "Katkesta"
+msgstr "Loobu"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:431
@@ -192,5 +184,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -199,5 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -208,23 +201,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -245,5 +238,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Hoiatus"
@@ -277,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -308,5 +301,5 @@
 msgstr "Vigadest teatamine"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -338,5 +331,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222
 msgid "Plugins"
-msgstr "Pistikud"
+msgstr "Pistikrakendused"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
@@ -367,19 +360,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Palun vali rida kustutamiseks"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Vali miski:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "Liida sõlmed."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -418,5 +408,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -449,18 +439,18 @@
 msgstr "Pikkuskraad"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Paiguta sõlmed ringikujuliselt."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Liiguta valitud sõlmed ringiks."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -489,18 +479,18 @@
 msgstr "Tööriist {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Palun vali vähemalt neli sõlme."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -513,5 +503,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -634,13 +624,13 @@
 msgstr "Sobita mitu teed üheks."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Palun vali vähemalt kaks teed, mida sobitada."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "Sobita erinevate kuuluvustega teed?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -649,13 +639,13 @@
 "Valitud teedel on erinevad kuuluvusseosed. Kas Sa oled sobitamises kindel?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "Sobita ikkagi."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Muuda suundi?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -665,9 +655,9 @@
 "pöörata?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Pööra ja sobita."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -676,5 +666,5 @@
 msgstr "Sisesta kõigi vastuolude kohta väärtused."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -682,14 +672,14 @@
 msgstr "Lahenda vastuolud."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Ühenda {0} teed."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "Kõik teed olid tühjad."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -706,24 +696,23 @@
 msgstr "Kopeeri valitud objektid puhvrisse."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Palun vali kopeerimiseks mõni objekt."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Moodusta ring"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Moodusta valitud kolmest sõlmest ring."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "Need sõlmed ei ole ringis."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -735,8 +724,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -756,15 +745,15 @@
 msgstr "Kustuta valitud objektid."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Ülekirjutamine"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "Fail eksisteerib! Kas kirjutada see üle?"
@@ -825,5 +814,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -833,7 +822,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "Viga allaladimise ajal"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -844,5 +832,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Kahekordista"
@@ -866,90 +855,36 @@
 msgstr "Rakenduse sulgemine."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr "Märkus: GPL ei ole OSM litsentsiga ühilduv. Ära lae GPL jälgi üles."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Ekspordi GPX-i..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Ekspordi andmed GPX faili."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Midagi ei ole eksportida."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "GPS jälje kirjeldus"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Lisa autori informatsioon"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Tegelik nimi"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr "E-post"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Autoriõigus (URL)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Eelseadistatud"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "Autoriõiguse aasta"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Võtmesõnad"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Ekspordi suvandid"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "Ekspordi ja salvesta"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Viga eksportimisel {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Vali eeldefineeritud litsents"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "Ekspordi andmed GPX faili."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -965,6 +900,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1035,5 +970,5 @@
 msgstr "Ühenda sõlm lähima teega."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "Ühenda sõlm ja joon."
@@ -1044,12 +979,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Liida igal juhul."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "Ühenda kiht otse all valitud kihti."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1091,12 +1024,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "valik"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Ei ole valitud primitiive mida uuendada."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1156,5 +1087,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "Uus"
@@ -1229,5 +1160,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
-#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1235,7 +1165,4 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 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?"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1249,5 +1176,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Kleebi"
@@ -1259,5 +1186,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Kleebi sildid."
@@ -1304,7 +1231,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Ei saa faili {0} ümber nimetada."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1341,5 +1268,10 @@
 msgstr "Fail {0} on juba olemas. Kas kirjutan üle?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "Ühtegi dokumenti pole avatud! Midagi pole salvestada."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1349,25 +1281,25 @@
 "sellest veast arendajaid."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "Ühtegi dokumenti pole avatud! Midagi pole salvestada."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Tühi dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "Dokumendis ei ole andmeid."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "Salvesta ikkagi."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Konfliktid"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1377,57 +1309,19 @@
 "tagasi. Jätkame?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "Lahenda vastuolud ja salvesta."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "Salvesta OSM fail."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "Salvesta GPX fail"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "Salvesta kiht"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Ei saa faili varundada."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Tundmatu faililaiend: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr "Salvestamisel ilmnes viga."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr "Varundatud faili taastamisel ilmnes viga"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Tundmatu faililaiend."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "Salvestamisel ilmnes viga."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr "Varundatud faili taastamisel ilmnes viga"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1539,23 +1433,17 @@
 "middle of the way.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
 "should verify this and correct it when necessary.</html>"
 msgstr ""
-"Rollipõhised seosed kopeeriti uutele teedele.\n"
-"Vaata need igaks juhuks üle."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
-#, fuzzy
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
 "this and correct it when necessary.</html>"
 msgstr ""
-"Relatsiooni liikmelisus kopeeriti kõikidele uutele teedele.\n"
-"Seda tuleb kontrollida ning vajadused viia sisse parandused."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1808,7 +1696,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "Lae kõik muudatused OSM serverisse üles."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1966,12 +1853,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "Andmete üles laadimine"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr "Massilisel allalaadimisel leidsid aset järgmised vead:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -2011,5 +1897,5 @@
 msgstr "Režiim: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2017,6 +1903,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2027,8 +1913,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2073,38 +1959,38 @@
 msgstr "valitud"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "Sõlme ei saa lisada maailmast väljapoole."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Lisa punkt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Lisa teele sõlm"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "Ühenda olemasolev tee sõlmega"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Ühenda uus sõlm olemasoleva teega"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "Lisa sõlm teele ja ühenda"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "Loo uus sõlm."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "Vali kursori all olev sõlm."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2113,14 +1999,14 @@
 msgstr[1] "Lisa {0} teele uus sõlm."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "Alusta uut teed viimasest sõlmest."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "Jätke teed viimasest sõlmest."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "Lõpeta joonistamine."
@@ -2140,5 +2026,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2150,5 +2036,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "Pööramise lõpetamiseks vabasta hiire nupp."
@@ -2183,9 +2069,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2195,18 +2081,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2420,26 +2306,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2448,5 +2334,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2536,8 +2422,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Lahenda vastuolud."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2554,5 +2439,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2594,5 +2479,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr ""
@@ -2605,5 +2490,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr ""
@@ -2611,5 +2496,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2618,8 +2504,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "Kustuda seadeid"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2629,9 +2514,221 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Liiguta"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "Sulanda {0} sõlm(e)"
+msgstr[1] "Sulanda {0} sõlm(e)"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "{0} punkt"
+msgstr[1] "{0} punkti"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Jada"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Ei suuda avada eelistuste kataloogi: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "Muuda {0} objekt"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2645,208 +2742,4 @@
 msgstr[1] "punktid"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Jada"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Ei suuda avada eelistuste kataloogi: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2878,5 +2771,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2909,5 +2802,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -2916,22 +2809,22 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -2996,10 +2889,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3007,5 +2902,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3013,57 +2908,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3115,5 +3010,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3147,4 +3042,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3179,13 +3078,25 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "Ei suutnud lugeda järjehoidjaid"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "Ei suutnud salvestada järjehoidjat"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3218,4 +3129,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3247,14 +3159,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "Ootamatu erandolukord"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
-msgstr "Ei saanud ühendust osm serveriga. Kontrollige oma interneti-ühendust."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3443,5 +3354,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
 msgid "Activating updated plugins"
-msgstr ""
+msgstr "Aktiveerin uuendatud pistikrakendused"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
@@ -3455,5 +3366,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Loading plugins"
-msgstr ""
+msgstr "Pistikrakenduste laadimine"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172
@@ -3481,6 +3392,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3509,39 +3420,39 @@
 msgstr "Heli"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "Liigu paremale"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Kaart: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "Liigu vasakule"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Liigu üles"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Liigu alla"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "Suurenda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Vähenda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr ""
@@ -3575,10 +3486,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "kiht ei ole nimekirjas"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3660,12 +3571,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3674,6 +3585,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3681,47 +3592,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Liikmed"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#, java-format
+msgid "{0} pending tag conflicts to be resolved"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
-#, java-format
-msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3729,25 +3640,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
@@ -3947,8 +3858,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4167,5 +4078,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4178,5 +4089,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4211,6 +4122,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4223,6 +4134,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4293,7 +4204,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4357,7 +4268,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Salvesta ikkagi."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4384,7 +4294,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Lahenda konfliktid"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4433,98 +4343,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Kihid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Ava kõikide laetud kihtide nimekiri."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Kustuta valitud kiht"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "On salvestamata muutusi. Kustutan kihi ikkagi?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "Kas sa tõesti tahad kogu kihti kustutada?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Info"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "Märkus"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Kustuta"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "Kustuta {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Näita/Peida"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Muuda valitud kihi nähtavust."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "Riik"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "Kustuta valitud kiht"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "Ühenda kiht otse all valitud kihti."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Liiguta valitud kiht ühe rea võrra üles."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Liiguta valitud kiht ühe rea võrra alla."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "Rohkem teavet sellest funktsioonist"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4533,22 +4437,22 @@
 msgstr[1] "See muudab kuni {0} objekti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "Tühi väärtus kustutab võtme."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<erinev>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Muuta väärtusi?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4556,5 +4460,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4563,49 +4467,40 @@
 msgstr[1] "Muuda kuni {0} objekti seadeid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Palun vali võti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Palun vali väärtus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 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/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "Seaded/Liikmelisus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Valitud objektide seaded"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "On liikmeks järgnevas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "Muuda seost"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "Tõesti soovid kustutada valikut seosest {0}?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "Lisa seaded"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4622,63 +4517,77 @@
 msgstr "Lisa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 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/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "Seadete muutmine"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 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/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Seaded: {0} / Liikmelisus: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "Seaded / Liikmelisus"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "Muuda seost"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "Tõesti soovid kustutada valikut seosest {0}?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "Kustuta valitud võti kõkides objektides"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "Kustuda seadeid"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "Kustuta valitud võti kõkides objektides"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Seaded: {0} / Liikmelisus: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "Seaded / Liikmelisus"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Seosed"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "Ava kõikide seoste nimekiri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "Seosed: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Ava toimetajas valitud seos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Kustuta valitud seos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Loo uus seos"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4709,5 +4618,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4776,5 +4685,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -4785,21 +4694,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "Allalaetav ala"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "Kustuta valitud seos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Allalaadimise asukoht"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr ""
@@ -4818,17 +4724,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "Seosed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "Andmete allalaadimine"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -4846,7 +4751,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "Seosed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -4857,9 +4761,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -4868,15 +4772,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "Tee uuesti viimane tagasivõtmine"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -4886,9 +4789,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -4898,15 +4801,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -4914,5 +4817,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -4920,65 +4823,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
+msgid "Remove all members referring to one of the selected primitives"
+msgstr ""
+
+#. putValue(NAME, tr("Remove Selected"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Relation Editor: Remove Selected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #, fuzzy
-msgid "Remove all members referring to one of the selected primitives"
-msgstr "Valitud primitiivide uuendamine ebaõnnestus."
-
-#. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
-msgid "Relation Editor: Remove Selected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Select primitives for selected relation members"
+msgstr "Kustuta valitud seos"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "Liiguta hetkel valitud liiget ülespoole"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "Liiguta hetkel valitud liiget allapoole"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Eemalda kõik hetkel valitud objektid seosest"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "Kustuta valitud seos"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -4987,10 +4905,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "Konfliktid andmetes"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -4999,21 +4916,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Salvesta praegused andmed"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5023,37 +4939,37 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Lae alla kõik sellest seosest puudu olevad teed ja puntid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "Lae alla liikmed"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5063,30 +4979,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Suumi välja"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "Liiguta hetkel valitud liiget allapoole"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5147,7 +5057,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "Lae valik"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -5181,7 +5090,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "lisa valikusse"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6312,5 +6220,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr ""
@@ -6336,5 +6244,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6353,5 +6261,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr ""
@@ -6389,43 +6297,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Kohanda värvi"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6433,6 +6341,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6506,10 +6414,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Muuda andme kihiks"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6520,11 +6428,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6533,29 +6441,29 @@
 msgstr "Muudetud sellest: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6564,9 +6472,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6574,5 +6482,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6622,5 +6530,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6645,5 +6553,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6651,5 +6559,5 @@
 msgstr[1] "punktid"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6658,5 +6566,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6665,5 +6573,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6672,9 +6580,9 @@
 msgstr[1] "{0} punkti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "gps marker"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6682,5 +6590,5 @@
 msgstr[1] "markerid"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6689,14 +6597,14 @@
 msgstr[1] "{0} koosneb {1} markerist"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "Sünkroniseeri heli"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 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:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6704,14 +6612,14 @@
 msgstr "Heli sünkroniseeritud punktis {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 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:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 msgid "Make Audio Marker at Play Head"
 msgstr "Loo heli marker mängimise alguses"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6719,13 +6627,13 @@
 msgstr "Pane heli pausile punktis kuhu sa soovid markerit."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 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:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Näita/Peida Tekst/Ikoonid"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Muuda markertekstide ja ikoonide nähtavust."
@@ -7299,5 +7207,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
 msgid "Download List"
-msgstr ""
+msgstr "Lae nimekiri alla"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
@@ -7330,7 +7238,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
-#, fuzzy
 msgid "JOSM Plugin description URL"
-msgstr "sümboolne kirjeldus"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
@@ -7721,7 +7628,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -7793,4 +7700,9 @@
 msgstr "Valmistan andmeid ette..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "Ei suutnud lugeda \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -7802,7 +7714,67 @@
 msgstr "Ei suutnud lugeda \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr "Märkus: GPL ei ole OSM litsentsiga ühilduv. Ära lae GPL jälgi üles."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "GPX failid"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "GPS jälje kirjeldus"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Lisa autori informatsioon"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Tegelik nimi"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr "E-post"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Autoriõigus (URL)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Eelseadistatud"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "Autoriõiguse aasta"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Võtmesõnad"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Ekspordi suvandid"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "Ekspordi ja salvesta"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Viga eksportimisel {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Vali eeldefineeritud litsents"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -7830,4 +7802,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Parse error: vigane gpx dokumendi struktuur"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Tundmatu tüüp: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -7975,4 +7952,5 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8004,4 +7982,32 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "OSM serveri failid"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8059,30 +8065,26 @@
 msgstr "Viga sõelumisel."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "OSM serveri failid"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Tundmatu versioon"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr "<nd> element võib olla vaid way-s."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "<nd> ei oma ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "Leidub <member> element, mis ei ole seotud"
@@ -8132,5 +8134,5 @@
 msgstr "Puudub vajalik atribuut \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8139,9 +8141,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "Tundmatu tüüp: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "Valmistan ette OSM andmeid..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr ""
@@ -8211,5 +8218,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "Update Plugins"
-msgstr "Uuenda pistikuid"
+msgstr "Pistikrakenduste uuendamine"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
@@ -8315,4 +8322,6 @@
 "overwrite the existing ones."
 msgstr ""
+"Uuendatud pistikrakenduste aktiveerimine ebaõnnestus. Kontrolli, kas JOSMil "
+"on piisavalt õigusi olemasolevate pistikrakenduste ülekirjutamiseks."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283
@@ -8347,7 +8356,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "Pluginate infot ei leitud"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8393,5 +8401,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137
 msgid "Download missing plugins"
-msgstr "Lae alla puuduvad pluginad"
+msgstr "Lae puuduvad pistikrakendused alla"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
@@ -8402,5 +8410,5 @@
 "{0}"
 msgstr ""
-"Lae järgnevad pluginad alla?\n"
+"Kas laen järgnevad pistikrakendused alla?\n"
 "\n"
 "{0}"
@@ -8462,6 +8470,6 @@
 "a bug."
 msgstr ""
-"Proovi uuendada JOSM ja kõik pluginad uusima versioonini enne veast "
-"teatamist."
+"Enne veast teatamist püüa uuendada JOSM ja kõik pistikrakendused uusima "
+"versioonini."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
@@ -8726,23 +8734,23 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr ""
 
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
+msgid "Open images with AgPifoJ..."
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
-msgid "Open images with AgPifoJ..."
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -8981,5 +8989,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr ""
@@ -9026,28 +9034,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the JOSM projection to Lambert and restart"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9056,9 +9049,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
@@ -9218,12 +9211,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
 msgstr ""
 
@@ -9291,5 +9291,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr ""
@@ -9999,22 +9999,27 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr ""
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "nimi"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10047,32 +10052,32 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+msgid "Capture GPS Track"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+msgid "Center Once"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+msgid "Center the LiveGPS layer to current position."
+msgstr ""
+
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
-msgid "Capture GPS Track"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
-msgid "Center Once"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
-msgid "Center the LiveGPS layer to current position."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
 msgid "Auto-Center"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr ""
@@ -10308,24 +10313,24 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -10564,10 +10569,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
-msgstr ""
+#, fuzzy, java-format
+msgid "{0} start"
+msgstr "{0} tee"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr ""
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} punkt"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11092,10 +11099,10 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
@@ -11754,9 +11761,32 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "PAlun vali rida muutmiseks"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "Vali kõik."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+msgid "Start adjusting"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "Pole muudatusi mida üles laadida."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11769,57 +11799,57 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr ""
@@ -12401,5 +12431,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -14956,5 +14986,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15256,5 +15286,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15357,5 +15387,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -19981,7 +20011,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "tee"
+msgstr ""
 
 #. color tertiary
@@ -23160,5 +23189,5 @@
 msgstr "Väikelinn/suurlinn"
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23169,5 +23198,5 @@
 msgstr "Ühesuunaline"
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23177,5 +23206,5 @@
 msgstr "Kirik"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23186,5 +23215,5 @@
 msgstr "Bensiinijaam"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23195,5 +23224,5 @@
 msgstr "Kauplus"
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23203,5 +23232,5 @@
 msgstr "WC"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23434,9 +23463,150 @@
 msgstr ""
 
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "API initsialiseerimine ebaõnnestus. Palun proovige hiljem uuesti."
-
-#~ msgid "API initialization failed"
-#~ msgstr "API initsialiseerimine ebaõnnestus"
+#~ msgid "Unknown file extension."
+#~ msgstr "Tundmatu faililaiend."
+
+#~ msgid "Move"
+#~ msgstr "Liiguta"
+
+#~ msgid "Data Layer"
+#~ msgstr "Andmekiht"
+
+#~ msgid "Not implemented yet."
+#~ msgstr "Pole veel teostatud."
+
+#~ msgid "Email"
+#~ msgstr "E-post"
+
+#~ msgid "their version:"
+#~ msgstr "nende versioon:"
+
+#~ msgid "my version:"
+#~ msgstr "minu versioon:"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM kasutajanimi (email)"
+
+#~ 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 "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 "Aborting..."
+#~ msgstr "Katkestan..."
+
+#~ 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 "Contacting the OSM server..."
+#~ msgstr "Ühendun OSM serveriga"
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Sildid (tühi väärtus kustutab sildi)"
+
+#~ msgid "Occupied By"
+#~ msgstr "Kasutab"
+
+#~ 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 "Remove the member in the current table row from this relation"
+#~ msgstr "Eemalda hetkel valitud tabelirea liige sellest seosest"
+
+#~ msgid "Basic"
+#~ msgstr "Lihtne"
+
+#~ msgid "Revert"
+#~ msgstr "Taasta"
+
+#~ msgid "Date"
+#~ msgstr "Kuupäev"
+
+#~ 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 "Layers: {0}"
+#~ msgstr "Kihid: {0}"
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Konfliktid: {0}"
+
+#~ 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 "Some of the nodes are (almost) in the line"
+#~ msgstr "Mõned sõlmed on enam-vähem ühel joonel."
+
+#~ 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 ""
+#~ "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 "unnamed"
+#~ msgstr "Nimetu"
+
+#~ 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 "Could not download plugin: {0} from {1}"
+#~ msgstr "Ei saa pistikut alla laadida: {0} kohast: {1}"
 
 #~ msgid ""
@@ -23447,154 +23617,4 @@
 #~ "laaditud?"
 
-#~ msgid "No data"
-#~ msgstr "Andmeid pole"
-
-#~ msgid "Update failed"
-#~ msgstr "Uuendamine ebaõnnestus"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Puuduv primitiiv"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Kihid: {0}"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Eemalda hetkel valitud tabelirea liige sellest seosest"
-
-#~ msgid "Data Layer"
-#~ msgstr "Andmekiht"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Pole veel teostatud."
-
-#~ msgid "Email"
-#~ msgstr "E-post"
-
-#~ msgid "their version:"
-#~ msgstr "nende versioon:"
-
-#~ msgid "my version:"
-#~ msgstr "minu versioon:"
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM kasutajanimi (email)"
-
-#~ 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 "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 "Aborting..."
-#~ msgstr "Katkestan..."
-
-#~ 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 "Contacting the OSM server..."
-#~ msgstr "Ühendun OSM serveriga"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Sildid (tühi väärtus kustutab sildi)"
-
-#~ msgid "Occupied By"
-#~ msgstr "Kasutab"
-
-#~ 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 "Basic"
-#~ msgstr "Lihtne"
-
-#~ msgid "Revert"
-#~ msgstr "Taasta"
-
-#~ msgid "Date"
-#~ msgstr "Kuupäev"
-
-#~ 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 "Conflicts: {0}"
-#~ msgstr "Konfliktid: {0}"
-
-#~ 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 "Some of the nodes are (almost) in the line"
-#~ msgstr "Mõned sõlmed on enam-vähem ühel joonel."
-
-#~ 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 ""
-#~ "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 "unnamed"
-#~ msgstr "Nimetu"
-
-#~ 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 "Could not download plugin: {0} from {1}"
-#~ msgstr "Ei saa pistikut alla laadida: {0} kohast: {1}"
-
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -23607,2 +23627,17 @@
 #~ msgid "Change"
 #~ msgstr "Muuda"
+
+#~ msgid "Failed to initialize API. Please try again later."
+#~ msgstr "API initsialiseerimine ebaõnnestus. Palun proovige hiljem uuesti."
+
+#~ msgid "API initialization failed"
+#~ msgstr "API initsialiseerimine ebaõnnestus"
+
+#~ msgid "Missing primitive"
+#~ msgstr "Puuduv primitiiv"
+
+#~ msgid "No data"
+#~ msgstr "Andmeid pole"
+
+#~ msgid "Update failed"
+#~ msgstr "Uuendamine ebaõnnestus"
Index: /applications/editors/josm/i18n/po/fi.po
===================================================================
--- /applications/editors/josm/i18n/po/fi.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/fi.po	(revision 16973)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-08-02 23:24+0000\n"
-"Last-Translator: Teemu Koskinen <Unknown>\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-04 10:54+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,13 +16,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:35+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -47,15 +40,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -80,7 +65,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -88,4 +73,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -107,8 +96,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Virhe"
@@ -119,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Tallentamattomia muutoksia"
@@ -137,16 +128,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -158,13 +148,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -181,4 +172,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "Peruuta"
@@ -192,5 +184,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -199,5 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -208,23 +201,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -245,5 +238,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Varoitus"
@@ -277,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -308,5 +301,5 @@
 msgstr "Virheilmoitukset"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -367,19 +360,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Ole hyvä ja valitse poistettava rivi."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Valitse joko:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "Yhdistä pisteet"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -418,5 +408,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -449,18 +439,18 @@
 msgstr "Pituusaste"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Siirrä pisteet ympyrän kehälle"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Siirtää valitut pisteet ympyrän kehälle."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -489,18 +479,18 @@
 msgstr "Työkalu: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Valitse ainakin neljä pistettä."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -513,5 +503,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -634,13 +624,13 @@
 msgstr "Yhdistää monta polkua yhdeksi."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Valitse ainakin kaksi yhdistettävää polkua."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "Yhdistetäänkö polut, joilla on eriävät jäsenyydet?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -650,13 +640,13 @@
 "ne?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "Yhdistä silti"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Vaihdetaanko suuntia?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -665,9 +655,9 @@
 "Polkuja ei voi yhdistää nykyisessä suunnassa. Haluatko kääntää osan niistä?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Käännä ja yhdistä"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -676,5 +666,5 @@
 msgstr "Syötä arvot kaikille ristiriidoille."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -682,14 +672,14 @@
 msgstr "Ratkaise ristiriitoja"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Yhdistä {0} polkua"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "Kaikki polut olivat tyhjiä"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -707,24 +697,23 @@
 msgstr "Kopioi valitut objektit leikepöydälle."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Valitse jotain kopioitavaksi."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Luo ympyrä"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Luo ympyrän kolmesta valitusta pisteestä."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "Valituista pisteistä ei voi muodostaa ympyrää."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -737,8 +726,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -758,15 +747,15 @@
 msgstr "Poista valitut objektit."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Korvaa"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "Tiedosto on jo olemassa. Korvataanko?"
@@ -827,5 +816,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -835,7 +824,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "Ristiriidassa oleva relaatio"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -846,5 +834,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Monista"
@@ -868,92 +857,36 @@
 msgstr "Poistu ohjelmasta."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Huomio: GPL ei ole yhteensopiva OSM:n käyttämän lisenssin kanssa. Älä lähetä "
-"GPL:n alaisia jälkiä."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "GPX-vienti..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Vie data GPX-tiedostoon."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Ei mitään vietävää. Hae ensin dataa."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "gps-jäljen kuvaus"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Lisää tekijän tiedot"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Oikea nimi"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr "Sähköposti"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Tekijänoikeudet (URL-osoite)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Ennaltamääritelty"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "Tekijänoikeuden vuosi"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Avainsanat"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Vientiasetukset"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "Vie ja tallenna"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Virhe vietäessä {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Valitse ennaltamääritetty lisenssi"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "Vie data GPX-tiedostoon."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -969,6 +902,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1039,5 +972,5 @@
 msgstr "Yhdistää pisteen lähimpään polun segmenttiin."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "Yhdistä piste ja polku."
@@ -1048,12 +981,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Yhdistä silti"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "Yhdistä valittu taso alla olevaan tasoon."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1097,12 +1028,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "valinta"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Siirrä valittuja jäseniä alaspäin"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1162,5 +1091,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "Uusi"
@@ -1236,5 +1165,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
-#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1242,7 +1170,4 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 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?"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1256,5 +1181,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Liitä"
@@ -1266,5 +1191,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Liitä tagit"
@@ -1311,7 +1236,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Tiedostoa \"{0}\" ei voitu nimetä uudelleen."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1348,5 +1273,10 @@
 msgstr "Tiedosto {0} on jo olemassa. Ylikirjoitetaanko?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "Ei mitään tallennettavaa: ei avoimia tiedostoja."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1356,25 +1286,25 @@
 "tasoja. Ole hyvä ja ilmoita tämä ohjelmistovirheenä."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "Ei mitään tallennettavaa: ei avoimia tiedostoja."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Tyhjä dokumentti"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "Dokumentti ei sisällä tietoa"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "Tallenna silti"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Ristiriidat"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1384,57 +1314,19 @@
 "ristiriidoista. Jatka tallennusta?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "Hylkää ristiriidat ja tallenna"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "Tallenna OSM-tiedosto"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "Tallenna GPX-tiedosto"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "Tallenna kerros"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Tiedostoa ei voitu varmuuskopioida."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Tuntematon tiedostopääte: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr "Tallennettaessa tapahtui virhe."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr "Varmuuskopion palauttamisessa tapahtui virhe."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Tuntematon tiedostopääte."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "Tallennettaessa tapahtui virhe."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr "Varmuuskopion palauttamisessa tapahtui virhe."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1547,25 +1439,17 @@
 "pisteitä, jotka eivät ole polun päissä.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
 "should verify this and correct it when necessary.</html>"
 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."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
-#, fuzzy
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
 "this and correct it when necessary.</html>"
 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."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1706,7 +1590,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
-#, fuzzy
 msgid "No current dataset found"
-msgstr "GPX-tasoa ei löytynyt."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
@@ -1820,7 +1703,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "Lähetä kaikki muutokset OSM-palvelimelle..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1978,7 +1860,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "Lähetetään dataa"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
@@ -2023,5 +1904,5 @@
 msgstr "Tila: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2032,6 +1913,6 @@
 "käyttävät polut."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2042,8 +1923,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2088,38 +1969,38 @@
 msgstr "valitut"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "Maailman ulkopuolelle ei voi lisätä pistettä."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Lisää piste"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Lisää piste polkuun"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "Yhdistä olemassa oleva polku pisteeseen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Lisää uusi piste olemassa olevaan polkuun"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "Lisää piste polkuun ja yhdistä"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "Luo uusi piste."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "Valitse kursorin alla oleva piste."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2128,14 +2009,14 @@
 msgstr[1] "Lisää uusi piste {0} polkuun."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "Aloita uusi polku viimeisestä pisteestä."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "Jatka polkua viimeisestä pisteestä."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "Lopeta piirtäminen."
@@ -2155,5 +2036,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Vapauta hiiren painike valitaksesi suorakaiteen sisään jäävät kohteet."
@@ -2165,5 +2046,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "Vapauta hiiren painike pyörityksen lopettamiseksi."
@@ -2198,9 +2079,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2212,18 +2093,18 @@
 "Oletko varma että haluat siirtää ne?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr "Toteuta siirto"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr "Kumoa siirto"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2442,26 +2323,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr "Loogiselta operaattorilta \"tai\" (or) puuttuu parametri."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr "Loogiselta operaattorilta \"ei\" (not) puuttuu parametri."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "Päättävä sulkumerkki puuttuu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2470,5 +2351,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2558,8 +2439,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Ratkaise ristiriita"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2571,10 +2451,10 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "Hakusanalla \"{0}\" ei löytynyt mitään"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2618,5 +2498,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "Poista relaatiosta"
@@ -2631,5 +2511,5 @@
 "Poistetaanko relaatiosta?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr "Katkaise polku"
@@ -2637,5 +2517,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2647,8 +2528,7 @@
 "<br>Oletko varma, että haluat poistaa ne?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "Poista relaatiosta"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2658,9 +2538,225 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Siirrä"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "Yhdistä {0} pistettä"
+msgstr[1] "Yhdistä {0} pistettä"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "{0} piste"
+msgstr[1] "{0} pistettä"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Komentosarja"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Toteutetaanko?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"Käännettäessä tätä polkua, seuraavat muutokset polun ja sen pisteiden "
+"ominaisuuksiin ovat suositeltuja."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Relaatio"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Vanha rooli"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "Uusi rooli"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Vanha avain"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Vanha arvo"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Uusi avain"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "Uusi arvo"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Toteuta valtiut muutokset"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Älä toteuta muutoksia"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "Valitse, minkä ominaisuuden muutoksen haluat toteuttaa."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Ominaisuudet: "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Automaattinen tagien korjaus"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Konfiguraatiotiedostossa virhe riv(e)illä {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Omien asetusten hakemistoa {0} ei voi avata."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+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}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Asetukset tallennettu kohteeseen {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Asetuksia ei voitu lähettää. Syy: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "Asetuksia ei voitu ladata palvelimelta."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "Asteina desimaalilukuna"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "Asteina, minuutteina ja sekunteina"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "E"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "P"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "L"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "I"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "Muuta {0} objekti"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "keskeneräinen"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2674,212 +2770,4 @@
 msgstr[1] "pistettä"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Komentosarja"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Toteutetaanko?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"Käännettäessä tätä polkua, seuraavat muutokset polun ja sen pisteiden "
-"ominaisuuksiin ovat suositeltuja."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "Relaatio"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "Vanha rooli"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "Uusi rooli"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Vanha avain"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Vanha arvo"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Uusi avain"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "Uusi arvo"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "Toteuta valtiut muutokset"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "Älä toteuta muutoksia"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "Valitse, minkä ominaisuuden muutoksen haluat toteuttaa."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "Ominaisuudet: "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "Automaattinen tagien korjaus"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Konfiguraatiotiedostossa virhe riv(e)illä {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Omien asetusten hakemistoa {0} ei voi avata."
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-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}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Asetukset tallennettu kohteeseen {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Asetuksia ei voitu lähettää. Syy: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "Asetuksia ei voitu ladata palvelimelta."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "Asteina desimaalilukuna"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "Asteina, minuutteina ja sekunteina"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "E"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "P"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "L"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "I"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "keskeneräinen"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2911,5 +2799,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2942,5 +2830,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -2949,22 +2837,22 @@
 msgstr[1] "{0} jäsentä"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "tie"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "rata"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "vesiväylä"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "maankäyttö"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -3029,10 +2917,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3040,5 +2930,5 @@
 msgstr "Poistettu jäsen \"{0}\" relaatiossa."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3046,58 +2936,58 @@
 msgstr "Polussa \"{0}\" on vähemmän kuin kaksi pistettä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr "Löytyi enemmän kuin yksi \"from\" -polku"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr "Löytyi enemmän kuin yksi \"to\" -polku"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr "Useita \"via\" -jäseniä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Tuntematon rooli \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr "Ei \"from\"-roolin tietä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr "Ei \"to\"-roolin tietä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr "Ei löytynyt pistettä tai tietä \"via\"-roolissa."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3149,5 +3039,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3181,4 +3071,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3213,13 +3107,25 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "Kirjanmerkkejä ei voitu lukea."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "Kirjanmerkkiä ei voitu kirjoittaa."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3252,4 +3158,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3281,14 +3188,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "Odottamaton poikkeus"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
-msgstr "OSM-palvelimeen ei voitu yhdistää. Tarkista internetyhteytesi."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3509,6 +3415,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3537,39 +3443,39 @@
 msgstr "Ääni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "Siirrä oikealle"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Kartta: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "Siirrä vasemmalle"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Siirrä ylös"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Siirrä alas"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "Lähennä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Loitonna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "skaalaus"
@@ -3603,10 +3509,10 @@
 msgstr "(ei objektia)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "taso ei ole listassa."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3688,12 +3594,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3702,6 +3608,6 @@
 msgstr "Tagit"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3709,47 +3615,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Jäsenet"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#, java-format
+msgid "{0} pending tag conflicts to be resolved"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
-#, java-format
-msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3757,25 +3663,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
@@ -3975,8 +3881,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4195,5 +4101,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4206,5 +4112,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4239,6 +4145,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4251,6 +4157,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4322,7 +4228,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4385,7 +4291,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Tallenna silti"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4412,7 +4317,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Ratkaise ristiriidat"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4461,99 +4366,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Tasot"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Avaa lista kaikista ladatuista tasoista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Poista valittu taso."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "Tallentamattomia muutoksia. Poistetaanko taso silti?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "Poista taso"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "Poistetaanko koko taso?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Tiedot"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "kyllä"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "P"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Poista"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "Poista {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Näytä/piilota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Näytä/piilota valittu taso."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "yksityinen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "Poista valittu taso."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "Yhdistä valittu taso alla olevaan tasoon."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Siirrä valittu taso rivi ylöspäin."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Siirrä valittu taso rivi alaspäin."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "Lisää tietoja tästä ominaisuudesta"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4562,22 +4460,22 @@
 msgstr[1] "Olet muuttamassa {0} kohdetta."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "Tyhjä arvo poistaa avaimen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<eri>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Muutetaanko arvot?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4585,5 +4483,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4592,49 +4490,40 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Valitse avain"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Valitse arvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Please select the objects you want to change properties for."
 msgstr "Valitse objektit, joiden ominaisuuksia haluat muokata."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "Ominaisuudet/jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Valittujen objektien ominaisuudet."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "Jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "Muuta relaatiota"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "Poistetaanko valinta relaatiosta {0}?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "Lisää ominaisuuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4651,63 +4540,77 @@
 msgstr "Lisää"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 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/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "Muokkaa ominaisuuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 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/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Ominaisuudet: {0} / Jäsenyydet: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "Ominaisuudet / Jäsenyydet"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "Muuta relaatiota"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "Poistetaanko valinta relaatiosta {0}?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "Poista valittu avain kaikista objekteista"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "Poista asetukset"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "Poista valittu avain kaikista objekteista"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Ominaisuudet: {0} / Jäsenyydet: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "Ominaisuudet / Jäsenyydet"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Relaatiot"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "Avaa lista kaikista relaatioista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaatiot: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Avaa valittu relaatio muokkaimeen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Poista valittu relaatio"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Luo uusi relaatio"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4738,5 +4641,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4806,5 +4709,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -4815,21 +4718,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "Lataa alue"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "Poista valittu relaatio"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Latauksen sijainti"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr ""
@@ -4848,17 +4748,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "Relaatiot"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "Ladataan dataa"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -4876,7 +4775,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "Relaatiot"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -4887,9 +4785,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -4898,15 +4796,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "Toista edellinen kumottu toiminto"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -4916,9 +4813,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -4928,15 +4825,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -4944,5 +4841,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -4950,64 +4847,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
+#, fuzzy
+msgid "Select primitives for selected relation members"
+msgstr "Poista valittu relaatio"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "Siirrä valittuja jäseniä ylöspäin"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "Siirrä valittuja jäseniä alaspäin"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Poista kaikki valitut objektit relaatiosta"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "Poista valittu relaatio"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5016,10 +4929,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "Ristiriidassa oleva relaatio"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -5028,21 +4940,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Tallenna tämänhetkinen data."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5052,37 +4963,37 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "Lataa jäsenet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5092,31 +5003,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
-msgstr "Varmista etähallinnan toimenpide"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Loitonna"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "Siirrä valittuja jäseniä alaspäin"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5177,7 +5081,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "Lataa valinta"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -5211,7 +5114,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "lisää valintaan"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6344,5 +6246,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Geo-merkityt kuvat"
@@ -6368,5 +6270,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6385,5 +6287,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG-kuvat (*.jpg)"
@@ -6421,43 +6323,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "gps-piste"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Muokkaa viivanpiirtotyyliä"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Käytä globaaleja asetuksia."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Piirrä viivat pisteiden välillä tällä tasolla."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Älä piirrä viivoja pisteiden välillä tällä tasolla."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Viivanpiirtoasetukset"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Muokkaa väriä"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6465,6 +6367,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6538,10 +6440,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Muuta datatasoksi"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6552,11 +6454,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6565,29 +6467,29 @@
 msgstr "Muutettu jäljestä {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 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:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "Lataa kaikki  alueella:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "Yhden pyynnön enimmäisalue:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} neliökilometriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6596,9 +6498,9 @@
 msgstr "<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 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:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6606,5 +6508,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6654,5 +6556,5 @@
 msgstr "Muuta GPX-tasoksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6677,5 +6579,5 @@
 msgstr[1] "jäljet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6683,5 +6585,5 @@
 msgstr[1] "pisteet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6690,5 +6592,5 @@
 msgstr[1] "jälki, jossa on {0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6697,5 +6599,5 @@
 msgstr[1] "{0}:ssä on {1} jälkeä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6704,9 +6606,9 @@
 msgstr[1] "{0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6714,5 +6616,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6721,14 +6623,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "Tahdista ääni"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 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:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6736,14 +6638,14 @@
 msgstr "Ääni tahdistettu pisteessä {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6751,13 +6653,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Näytä/piilota teksti/kuvakkeet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
@@ -7772,7 +7674,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -7844,4 +7746,9 @@
 msgstr "Valmistellaan karttatietoja..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "Ei voitu lukea \"{0}\":aa"
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -7853,7 +7760,69 @@
 msgstr "Ei voitu lukea \"{0}\":aa"
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Huomio: GPL ei ole yhteensopiva OSM:n käyttämän lisenssin kanssa. Älä lähetä "
+"GPL:n alaisia jälkiä."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "GPX-tiedostot"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "gps-jäljen kuvaus"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Lisää tekijän tiedot"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Oikea nimi"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr "Sähköposti"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Tekijänoikeudet (URL-osoite)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Ennaltamääritelty"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "Tekijänoikeuden vuosi"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Avainsanat"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Vientiasetukset"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "Vie ja tallenna"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Virhe vietäessä {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Valitse ennaltamääritetty lisenssi"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -7881,4 +7850,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Virhe luettaessa gpx-tiedostoa: tiedoston rakenne virheellinen."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Tuntematon rooli \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8011,7 +7985,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "Tutkii hakemistoa {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8026,4 +8000,5 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8055,4 +8030,32 @@
 msgstr "Kirjaudu sisään"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "OSM-palvelintiedostot"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8110,30 +8113,26 @@
 msgstr "Virhe jäsennettäessä."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "OSM-palvelintiedostot"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Tuntematon versio"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr "<nd>-elementti muussa kuin polussa."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "<member>-tagi muussa kuin relaatiossa."
@@ -8183,5 +8182,5 @@
 msgstr "Puuttuva pakollinen attribuutti \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8190,9 +8189,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "Tuntematon tyyppi: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "Valmistellaan OSM-karttatietoja..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "Vääränlainen pisteen id"
@@ -8315,9 +8319,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
-"Varoitus: liitännäinen {0} oli pyydettyjen listalla, muttei ole enää "
-"tarpeellinen."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8408,7 +8410,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "Liitännäistietoja ei löytynyt."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8797,23 +8798,23 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr "Sijoittele GPX-tiedoston mukaisesti"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} kuvasta löytyi gps-sijaintitiedot."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "Avaa kuvia AgPifoJ:llä..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9056,5 +9057,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Virhe ladattaessa tiedostoa"
@@ -9101,28 +9102,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the JOSM projection to Lambert and restart"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9131,9 +9117,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
@@ -9293,12 +9279,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
 msgstr ""
 
@@ -9366,5 +9359,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr ""
@@ -10084,22 +10077,27 @@
 msgstr "Kuvaa ei voitu ladata"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr "Yhdistetään"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr "Yhdistetty"
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr "Yhteys epäonnistui"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "nimi"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10132,32 +10130,32 @@
 msgstr "LiveGPS-taso"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr "Kytkeydy gpsd-palvelimeen ja näytä nykyinen sijainti LiveGPS-tasossa."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center Once"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center the LiveGPS layer to current position."
 msgstr "Keskitä LiveGPS-taso nykyiseen sijaintiin."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Keskitä LiveGPS-taso jatkuvasti nykyiseen sijaintiin."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -10401,24 +10399,24 @@
 msgstr "Sallitut toiminnot"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Etähallinta on pyytänyt datan lataamista API:sta."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr "Pyynnös tiedot: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr "Sallitaanko tämä?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr "Varmista etähallinnan toimenpide"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -10657,10 +10655,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
-msgstr ""
+#, fuzzy, java-format
+msgid "{0} start"
+msgstr "{0} metriä"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr ""
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} piste"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11198,10 +11198,10 @@
 msgstr "Risteävät polut"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr "Päällekkäiset pisteet"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Tarkistaa etteivät mitkään pisteet ole identtisissä koordinaateissa."
@@ -11878,9 +11878,32 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "Ole hyvä ja valitse muokattava rivi."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "Poista taso"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+msgid "Start adjusting"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "Ei lähetettäviä muutoksia."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11893,15 +11916,15 @@
 msgstr "Automaattinen lataus"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -11910,42 +11933,42 @@
 "resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Vaihda resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Tallenna WMS-taso tiedostoon"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "Lataa WMS-taso tiedostosta"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr ""
@@ -12529,5 +12552,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -15084,5 +15107,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15384,5 +15407,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15485,5 +15508,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -20109,7 +20132,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "moottoritie"
+msgstr ""
 
 #. color tertiary
@@ -23288,5 +23310,5 @@
 msgstr "Kunta/kaupunki"
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23297,5 +23319,5 @@
 msgstr ""
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23305,5 +23327,5 @@
 msgstr "Kirkko"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23314,5 +23336,5 @@
 msgstr "Huoltoasema"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23323,5 +23345,5 @@
 msgstr ""
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23331,5 +23353,5 @@
 msgstr "WC"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23562,102 +23584,87 @@
 msgstr ""
 
-#~ 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 "Update failed"
-#~ msgstr "Päivitys epäonnistui"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Tasot: {0}"
+#~ msgid "Unknown file extension."
+#~ msgstr "Tuntematon tiedostopääte."
+
+#~ msgid "Move"
+#~ msgstr "Siirrä"
+
+#~ msgid "Aborting..."
+#~ msgstr "Keskeytetään..."
+
+#~ msgid "Add Selected"
+#~ msgstr "Lisää valitut"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Lisää valitut objektit jäseniksi"
+
+#~ msgid "Revert"
+#~ msgstr "Palauta"
+
+#~ msgid "Date"
+#~ msgstr "Päivämäärä"
+
+#~ msgid "Object"
+#~ msgstr "Objekti"
+
+#~ msgid "Not implemented yet."
+#~ msgstr "Ominaisuutta ei ole vielä toteutettu."
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)."
+
+#~ msgid "Email"
+#~ msgstr "Sähköpostiosoite"
 
 #~ msgid "Remove the member in the current table row from this relation"
 #~ msgstr "Poista taulukon aktiivisella rivillä oleva jäsen relaatiosta"
 
-#~ 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 "Error parsing server response."
+#~ msgstr "Virhe palvelimen vastauksen käsittelyssä."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)"
+
+#~ msgid "my version:"
+#~ msgstr "minun versioni:"
+
+#~ msgid "their version:"
+#~ msgstr "palvelimen versio:"
+
+#~ msgid "Rotate"
+#~ msgstr "Kierrä"
+
+#~ msgid "Change"
+#~ msgstr "Muokkaa"
+
+#~ msgid "position"
+#~ msgstr "sijainti"
+
+#~ msgid "false"
+#~ msgstr "epätosi"
+
+#~ msgid "true"
+#~ msgstr "tosi"
+
+#~ msgid "different"
+#~ msgstr "eri"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "unnamed"
+#~ msgstr "nimetön"
+
+#~ msgid "Data Layer"
+#~ msgstr "Datataso"
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Tuo TCX-tiedosto GPS-jälkenä"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Tuo TCX-tiedosto..."
 
 #~ msgid "Validate"
 #~ msgstr "Tarkista"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Tarkista joko nykyinen valitna tai koko data."
-
-#~ msgid "Aborting..."
-#~ msgstr "Keskeytetään..."
-
-#~ msgid "Add Selected"
-#~ msgstr "Lisää valitut"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Lisää valitut objektit jäseniksi"
-
-#~ msgid "Revert"
-#~ msgstr "Palauta"
-
-#~ msgid "Date"
-#~ msgstr "Päivämäärä"
-
-#~ msgid "Object"
-#~ msgstr "Objekti"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Ominaisuutta ei ole vielä toteutettu."
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)."
-
-#~ msgid "Email"
-#~ msgstr "Sähköpostiosoite"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Virhe palvelimen vastauksen käsittelyssä."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)"
-
-#~ msgid "my version:"
-#~ msgstr "minun versioni:"
-
-#~ msgid "their version:"
-#~ msgstr "palvelimen versio:"
-
-#~ msgid "Rotate"
-#~ msgstr "Kierrä"
-
-#~ msgid "Change"
-#~ msgstr "Muokkaa"
-
-#~ msgid "position"
-#~ msgstr "sijainti"
-
-#~ msgid "false"
-#~ msgstr "epätosi"
-
-#~ msgid "true"
-#~ msgstr "tosi"
-
-#~ msgid "different"
-#~ msgstr "eri"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "unnamed"
-#~ msgstr "nimetön"
-
-#~ msgid "Data Layer"
-#~ msgstr "Datataso"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Tuo TCX-tiedosto GPS-jälkenä"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Tuo TCX-tiedosto..."
 
 #~ msgid "Some of the nodes are (almost) in the line"
@@ -23728,6 +23735,14 @@
 #~ msgstr "Ratkaise {0} ristiriitaa {1} objektissa"
 
+#~ 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 "Really mark this issue as ''done''?"
 #~ msgstr "Merkataanko tämä ongelma todella \"valmiiksi\"?"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Tarkista joko nykyinen valitna tai koko data."
 
 #~ msgid "Drawbridge"
@@ -23794,4 +23809,7 @@
 #~ msgstr "Siirrä WMS-tasoa (kuvaa) suhteessa muihin tasoihin"
 
+#~ msgid "Layers: {0}"
+#~ msgstr "Tasot: {0}"
+
 #~ msgid "Conflicts: {0}"
 #~ msgstr "Ristiriidat: {0}"
@@ -23865,4 +23883,11 @@
 
 #~ 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 ""
 #~ "The sources (URL or filename) of tagging preset definition files. See "
 #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
@@ -23870,2 +23895,5 @@
 #~ "Tagien esivalintatiedot (URL-osoite tai tiedostonimi). Lisätietoja "
 #~ "osoitteessa http://josm.openstreetmap.de/wiki/TaggingPresets"
+
+#~ msgid "Update failed"
+#~ msgstr "Päivitys epäonnistui"
Index: /applications/editors/josm/i18n/po/fr.po
===================================================================
--- /applications/editors/josm/i18n/po/fr.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/fr.po	(revision 16973)
@@ -6,6 +6,6 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-08-01 11:05+0000\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-04 10:43+0000\n"
 "Last-Translator: Sébastien Beaujard <seb@sebandjohn.fr>\n"
 "Language-Team: Fr\n"
@@ -14,13 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:35+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -45,15 +38,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -78,7 +63,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -86,4 +71,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -105,8 +94,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Erreur"
@@ -119,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Modifications non enregistrées"
@@ -139,16 +130,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -160,13 +150,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -183,4 +174,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "Annuler"
@@ -194,5 +186,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -201,5 +193,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -210,23 +203,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -247,5 +240,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Avertissement"
@@ -279,5 +272,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -310,5 +303,5 @@
 msgstr "Rapports d'erreur"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -375,19 +368,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Veuillez sélectionnez la rangée à supprimer."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Sélectionner au choix :"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "Fusionner les nœuds"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -426,5 +416,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -457,18 +447,18 @@
 msgstr "Longitude"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Placer les nœuds en cercle"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Déplacer les nœuds sélectionnés en un cercle."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -497,18 +487,18 @@
 msgstr "Outil : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Veuillez sélectionner au moins quatre nœuds."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -521,5 +511,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -650,14 +640,14 @@
 msgstr "Fusionner plusieurs chemins en un seul."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Veuillez sélectionner au moins deux chemins à fusionner."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr ""
 "Fusionner des chemins qui ne sont pas les mêmes membres d’une relation ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -667,13 +657,13 @@
 "Voulez-vous encore les fusionner ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "Fusionner quand même"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Changer les directions ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -683,9 +673,9 @@
 "la même direction. En retourner certaines ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Inverser et fusionner"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -694,5 +684,5 @@
 msgstr "Entrer des valeurs pour tous les conflits."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -700,14 +690,14 @@
 msgstr "Résoudre les conflits"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Fusionner {0} voies"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "Toutes les voies étaient vides"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -726,24 +716,23 @@
 msgstr "Copier les objets sélectionnés dans la mémoire tampon."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Veuillez sélectionner quelque chose à copier."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Créer un cercle"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Créer un cercle à partir de trois nœuds sélectionnés."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "Ces nœuds ne sont pas en cercle."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -757,8 +746,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -778,15 +767,15 @@
 msgstr "Supprimer les objets sélectionnés."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Écrire dessus"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "Le fichier existe déjà. Écrire dessus ?"
@@ -847,5 +836,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -855,7 +844,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "Erreurs durant le téléchargement"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -866,5 +854,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Dupliquer"
@@ -888,92 +877,36 @@
 msgstr "Quitter l’application."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Nota : la licence GPL est incompatible avec la licence  OSM. Ne pas charger "
-"de traces sous licence GPL."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Exporter en GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Exporter les données vers un fichier GPX."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Rien à exporter. Obtenez d’abord des données."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr "le paramètre \"{0}\" ne doit pas être nul"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "description de la trace GPS"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Ajouter des informations sur l’auteur"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Nom réel"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Copyright (URL)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Prédéfini"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "Année du copyright"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Mots-clés"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Options d’export"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "Exporter et sauvegarder"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Erreur en exportant {0} :\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Choisir une licence prédéfinie"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "Exporter les données vers un fichier GPX."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -989,6 +922,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1062,5 +995,5 @@
 msgstr "Joindre un nœud au chemin le plus proche."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "Joindre le nœud et la ligne"
@@ -1071,13 +1004,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Fusionner tout de même"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
 msgstr ""
-"Fusionner le calque immédiatement en dessous avec le calque sélectionné."
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1123,12 +1053,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "la sélection"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Met à jour la sélection de primitive depuis le serveur"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1188,5 +1116,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "Nouveau"
@@ -1265,5 +1193,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
-#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1271,7 +1198,4 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 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 ?"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1285,5 +1209,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Coller"
@@ -1295,5 +1219,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Copier les étiquettes"
@@ -1341,7 +1265,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Impossible de renommer le fichier \"{0}\"."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1378,5 +1302,10 @@
 msgstr "Le fichier {0} existe. L'écraser ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "Pas d’intersection trouvée. Rien n’a été modifié."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1386,25 +1315,25 @@
 "Merci de signaler ceci comme une erreur."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "Aucun document ouvert donc rien à sauvegarder."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Document vide"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "Le document ne contient pas de données."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "Sauvegarder tout de même"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Conflits"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1414,59 +1343,19 @@
 "sauvegardés si vous ne les traitez pas. Continuer ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "Rejeter les conflits et sauvegarder"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "Sauvegarder le fichier OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "Sauvegarder le fichier GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "Sauvegarder le calque"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Impossible de sauvegarder le fichier."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Extension de fichier inconnue : {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr ""
-"<html>Une erreur est survenue durant la communication avec le "
-"serveur<br>Détails :{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr "Une erreur est survenue lors de la restauration de la sauvegarde."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Extension de fichier inconnue."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "Une erreur est survenue lors de la sauvegarde."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr "Une erreur est survenue lors de la restauration de la sauvegarde."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1582,24 +1471,17 @@
 "sélectionner les nœuds au milieu du chemin.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
 "should verify this and correct it when necessary.</html>"
 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."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
-#, fuzzy
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
 "this and correct it when necessary.</html>"
 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."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1739,13 +1621,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
-#, fuzzy
 msgid "No current dataset found"
-msgstr "Pas de calque de données GPX trouvé."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
-#, fuzzy
 msgid "Didn't find a primitive with id {0} in the current dataset"
 msgstr ""
-"Impossible de trouver la primitive d’id {0} dans le jeu de données courant"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
@@ -1869,7 +1748,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "Envoyer tous les changements sur le serveur OSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -2008,9 +1886,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
-"Attention : exception ignorée car la tâche est annulée. Exception : {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
@@ -2028,12 +1905,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "Envoi des données"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr "Les erreurs suivantes sont survenues durant le transfert :"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -2079,5 +1955,5 @@
 msgstr "Mode: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2088,6 +1964,6 @@
 "supprimer tous les objets utilisant cet objet."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2098,8 +1974,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2144,38 +2020,38 @@
 msgstr "sélectionné"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "Impossible d'ajouter un nœud en dehors du monde"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Ajouter un nœud"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Ajouter un nœud au chemin."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "Connecter le chemin existant au nœud"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Ajouter un nœud à un chemin existant."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "Ajouter un nœud sur le chemin et le connecter"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "Créer un nouveau nœud."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "Sélectionner le nœud sous le curseur."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2184,14 +2060,14 @@
 msgstr[1] "Ajouter un nouveau nœud aux {0} chemins."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "Commencer un nouveau chemin à partir du dernier nœud."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "Continuer le chemin à partir du dernier nœud."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "Terminer le tracé."
@@ -2211,5 +2087,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2223,5 +2099,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "Relacher le bouton de souris pour arrêter la rotation."
@@ -2259,9 +2135,9 @@
 msgstr[1] "Ajouter et déplacer un nouveau nœud virtuel aux {0} chemins."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr "Déplacer des éléments"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2274,13 +2150,13 @@
 "Souhaitez vous les déplacer ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr "Les déplacer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr "Annuler déplacer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2289,5 +2165,5 @@
 "fusionner avec le nœud le plus proche."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2525,26 +2401,26 @@
 "relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Jeton inattendu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr "Arguments manquants pour le OU"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr "Arguments manquants pour le -"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "Les parenthèses doivent être fermées."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Erreur de nombre de paramètre pour une opération sur des nœuds."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2556,5 +2432,5 @@
 "10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2644,8 +2520,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Résoudre le conflit"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2657,10 +2532,10 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "Aucun résultat trouvé pour \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2706,5 +2581,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "Supprimer de la relation"
@@ -2719,5 +2594,5 @@
 "Supprimer de la relation ?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr "Séparer le segment du chemin"
@@ -2725,5 +2600,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2735,8 +2611,7 @@
 "voyez pas) pourraient les utiliser.<br>Voulez-vous vraiment les supprimer ?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "Supprimer de la relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2746,9 +2621,227 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Déplacer"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "Fusionner {0} nœuds"
+msgstr[1] "Fusionner {0} nœuds"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr "Suppression d’une primitive"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr "suppression de la référence du chemin {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+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. Il est actuellement de {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr "suppression de la référence de la relation {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr "Résoudre les conflits de la liste des membres de la relation {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr "supprimer le membre de la relation {0} {1}"
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "effectuer une rotation de {0}{1}"
+msgstr[1] "effectuer une rotation de {0}{1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Séquence"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "Résoudre {0} conflits d’étiquette dans {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr "Restaurer {0} primitives"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr "Résoudre les conflits de version de {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr "Résoudre les conflits de la liste de noeuds du chemin {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr "le jeu de données principal ne contient pas le noeud {0}"
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Appliquer ?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"Les changements suivants aux propriétés du chemin sont suggérés après son "
+"retournement pour préserver la consistence des données."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Relation"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Ancien rôle"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "Nouveau rôle"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Ancienne clé"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Ancienne valeur"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Nouvelle clé"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "Nouvelle valeur"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Appliquer les changements sélectionnés"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Ne pas appliquer les changements"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "Merci de sélectionner les changements que vous voulez appliquer"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Propriétés de "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr "Rôles de la relation de référence"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Correction automatique d’étiquette"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Erreur dans le fichier de configuration aux lignes {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Impossible d’ouvrir le répertoire des préférences : {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+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}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Préférences sauvegardées sur {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Impossible de charger les préférences. Raison : {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "Impossible de charger les préférences depuis le serveur."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "Degrés décimaux"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "Degrés Minutes Secondes"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "O"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "E"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "Changer {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr "paramètre {0} > 0 requis. Reçu {1}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "incomplet"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2762,214 +2855,4 @@
 msgstr[1] "nœuds"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr "Suppression d’une primitive"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr "suppression de la référence du chemin {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-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. Il est actuellement de {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr "suppression de la référence de la relation {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr "Résoudre les conflits de la liste des membres de la relation {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr "supprimer le membre de la relation {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr "effectuer une rotation de {0}{1}"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Séquence"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "Résoudre {0} conflits d’étiquette dans {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr "Restaurer {0} primitives"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "Résoudre les conflits de version de {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr "Résoudre les conflits de la liste de noeuds du chemin {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr "le jeu de données principal ne contient pas le noeud {0}"
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Appliquer ?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"Les changements suivants aux propriétés du chemin sont suggérés après son "
-"retournement pour préserver la consistence des données."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "Relation"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "Ancien rôle"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "Nouveau rôle"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Ancienne clé"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Ancienne valeur"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Nouvelle clé"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "Nouvelle valeur"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "Appliquer les changements sélectionnés"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "Ne pas appliquer les changements"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "Merci de sélectionner les changements que vous voulez appliquer"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "Propriétés de "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr "Rôles de la relation de référence"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "Correction automatique d’étiquette"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Erreur dans le fichier de configuration aux lignes {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Impossible d’ouvrir le répertoire des préférences : {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-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}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Préférences sauvegardées sur {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Impossible de charger les préférences. Raison : {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "Impossible de charger les préférences depuis le serveur."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "Degrés décimaux"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "Degrés Minutes Secondes"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "O"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "E"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "paramètre {0} > 0 requis. Reçu {1}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "incomplet"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -3001,5 +2884,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -3032,5 +2915,5 @@
 msgstr "le paramètre \"{0}\" n’est pas une classe acceptable, reçu \"{1}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -3039,22 +2922,22 @@
 msgstr[1] "{0} membres"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "highway"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "voie ferrée"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "voie navigable"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "utilisation du terrain"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -3122,10 +3005,12 @@
 msgstr "Le multipolygone \"{0}\" n'est pas fermé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "Membre vide dans la relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3133,5 +3018,5 @@
 msgstr "Membre \"{0}\" supprimé de la relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3139,58 +3024,58 @@
 msgstr "Chemin \"{0}\" comporte moins de deux points."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr "Plus d'un chemin d'origine trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr "Plus d'un chemin \"destination\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr "Plus d'un \"via\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Rôle inconnu \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Type de membre inconnu pour \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr "Pas de chemin d'origine trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr "Pas de chemin \"destination\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr "Pas de noeud ou de chemin \"via\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 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\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 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\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 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\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 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\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3243,5 +3128,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3278,4 +3163,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3315,13 +3204,25 @@
 msgstr "Zone  UTM {0}"
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "Impossible de lire les marque-pages."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "Impossible d’écrire un marque-page."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3360,4 +3261,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3389,16 +3291,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "Exception inattendue"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
 msgstr ""
-"Impossible de joindre le serveur OSM. Veuillez vérifier votre connectivité "
-"Internet."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3407,5 +3306,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -3413,7 +3312,4 @@
 "preferences and your internet connection.</html>"
 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."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
@@ -3437,8 +3333,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: failed to bring extended dialog always on top. Exception: {0}"
 msgstr ""
-"Attention : exception ignorée car la tâche est annulée. Exception : {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65
@@ -3637,6 +3532,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3665,39 +3560,39 @@
 msgstr "Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "Déplacer à droite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Carte : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "Déplacer à gauche"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Déplacer vers le haut"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Déplacer vers le bas"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "Zoom avant"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Zoom arrière"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "échelle"
@@ -3731,10 +3626,10 @@
 msgstr "(aucun objet)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "le calque n’est pas dans la liste."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3819,12 +3714,12 @@
 msgstr "le rôle {0} ne fait pas partie de la comparaison des paires {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3833,6 +3728,6 @@
 msgstr "Étiquettes"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3840,30 +3735,30 @@
 msgstr "Nœuds"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "Aucun conflit d’étiquette n'est résolu"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Étiquettes ({0} conflits)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} étiquette(s) en conflit à résoudre"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Nœuds (résolus)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
@@ -3872,17 +3767,17 @@
 "la liste de nœuds de ce chemin"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Nœuds (avec conflits)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "Conflits à résoudre dans la liste des nœuds de ce chemin"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Membres (résolus)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3892,25 +3787,25 @@
 "dans la liste des membres  de cette relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Membres (avec conflits)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Conflits à résoudre dans la liste des membres de cette relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr "Pas de conflit de propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Propriétés (avec conflits)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr "Des conflits de propriété sont en attente de résolution"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Résolution de conflits"
@@ -4129,8 +4024,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4365,5 +4260,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4376,5 +4271,5 @@
 msgstr "Primitive"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4412,6 +4307,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4424,6 +4319,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4496,7 +4391,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4563,7 +4458,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Continuer tout de même"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4572,5 +4466,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>You didn''t finish to merge the differences in this conflict."
@@ -4580,8 +4474,4 @@
 "<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210
@@ -4594,7 +4484,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Résoudre les conflits de version de {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4645,101 +4535,92 @@
 msgstr "Afficher l'historique de la primitive sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Calques"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Ouvrir une liste de tous les calques chargés."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Supprimer le calque sélectionné."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
-"Il y a des changements non enregistrés. Supprimer le calque quand même ?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "Supprimer le calque"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "Voulez-vous vraiment supprimer la totalité du calque ?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Information"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "oui"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Supprimer"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "Supprimer {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Montrer/Cacher"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Bascule l'état de visibilité du calque sélectionné."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "privé"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "Supprimer le calque sélectionné."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
 msgstr ""
-"Fusionner le calque immédiatement en dessous avec le calque sélectionné."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Déplacer le calque sélectionné un niveau vers le haut."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Déplacer le calque sélectionné un niveau vers le bas."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "Bureau d'informations"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4748,22 +4629,22 @@
 msgstr[1] "Cela modifiera {0} objets maximum."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "Une valeur vide supprime la clé."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<différent>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Changer les valeurs ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4771,5 +4652,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4778,50 +4659,41 @@
 msgstr[1] "Modifier les propriétés de {0} objets maximum."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Veuillez sélectionner une clé"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Veuillez sélectionner une valeur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 "Veuillez sélectionner les objets dont vous voulez changer les propriétés."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "Propriétés/Appartenances"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Propriétés des objets sélectionnés."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "Membre de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "Changer la relation"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "Supprimer vraiment la sélection de la relation {0} ?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "Ajouter des Propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4838,63 +4710,79 @@
 msgstr "Ajouter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Add a new key/value pair to all objects"
 msgstr "Ajouter une nouvelle paire clé/valeur à tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "Éditer les propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 msgid "Edit the value of the selected key for all objects"
 msgstr "Éditer la valeur de la clé selectionnée pour tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Propriétés : {0} / Appartenances : {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "Propriétés / Appartenances"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "Changer la relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "Supprimer vraiment la sélection de la relation {0} ?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "Supprimer la clé sélectionnée de tous les objets"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "Supprimer les propriétés"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "Supprimer la clé sélectionnée de tous les objets"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Propriétés : {0} / Appartenances : {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "Propriétés / Appartenances"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "Ouvrir une liste de toutes les relations."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relations : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Ouvrir un éditeur pour la relation sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Supprimer la relation sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Créer une nouvelle relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
+"Créer une copie de cette relation et l'ouvrir dans une nouvelle fenêtre "
+"d'édition"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4925,5 +4813,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4994,31 +4882,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
-#, fuzzy
 msgid "Download all child relations (recursively)"
-msgstr "télécharger les membres de la relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "Télécharger zone"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "télécharger les relations référentes"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Télécharger les tuiles visibles"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr "télécharger les membres de la relation"
@@ -5037,17 +4921,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "Aucune relation sélectionnée"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "Téléchargement du greffon {0}..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5066,7 +4949,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "Relations"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -5077,9 +4959,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5088,15 +4970,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "Élément supprimé des relations"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -5106,9 +4987,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -5118,5 +4999,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -5125,5 +5006,5 @@
 "premier membre"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5132,5 +5013,5 @@
 "dernier membre"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5138,5 +5019,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5144,67 +5025,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Remove all members referring to one of the selected primitives"
-msgstr "Échec de la mise à jour des primitives sélectionnées."
+msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Relation Editor: Remove Selected"
 msgstr "Éditeur de relation : supprimer la sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
+#, fuzzy
+msgid "Select primitives for selected relation members"
+msgstr "Supprimer la relation sélectionnée"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr "trier les membres de la relation"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr "éditeur de relation : trier"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "Déplacer les membres sélectionnés vers le haut"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr "Éditeur de relation : déplacer vers le haut"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "Déplacer les membres sélectionnés vers le bas"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr "Éditeur de relation : déplacer vers le bas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Retirer tous les objets sélectionnés de la relation"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr "éditeur de relation : supprimer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "Supprimer la relation sélectionnée"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr "Continuer la résolution"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5212,14 +5106,10 @@
 "conflict and close the editor?</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>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "Conflits dans les données"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -5228,21 +5118,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Sauvegarder les données actuelles."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr "Appliquer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr "Appliquer les changements et fermer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5252,37 +5141,37 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr "Annuler les changements et fermer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr "Ajouter une étiquette vide"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr "Supprimer les étiquettes sélectionnées"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Télécharger tous les chemins et les nœuds incomplets dans la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "Télécharger les membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr "Éditeur de relation : télécharger les membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr "Définir un rôle pour les membres sélectionnés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr "Appliquer le rôle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5292,34 +5181,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
-msgstr "Oui, le supprimer"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
-msgstr "Confirmer l’action Remote Control"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
-msgstr ""
-"Créer une copie de cette relation et l'ouvrir dans une nouvelle fenêtre "
-"d'édition"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Zoom arrière"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "Déplacer les membres sélectionnés vers le bas"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5380,13 +5259,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "Charger la sélection"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy
 msgid "Warning: ignoring exception because task was cancelled. Exception was: "
 msgstr ""
-"Attention : exception ignorée car la tâche est annulée. Exception : {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70
@@ -5416,7 +5292,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "Changer de lieu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6565,5 +6440,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Images géolocalisées"
@@ -6589,5 +6464,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6606,5 +6481,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "images JPEG (*.jpg)"
@@ -6642,43 +6517,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "point GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Personnaliser le dessin des lignes"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Utiliser les réglages généraux."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Dessiner des lignes entre les points pour ce calque."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Ne pas dessiner de ligne entre les points pour ce calque."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Sélectionner les options de dessin des lignes"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Personnaliser la couleur"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6686,6 +6561,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6759,10 +6634,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Convertir en calque de données"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6774,11 +6649,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6787,29 +6662,29 @@
 msgstr "Converti depuis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr "Télécharger depuis OSM le long de cette trace"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "Tout télécharger dans un rayon de :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} mètres"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "Aire maximale par requête:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6820,5 +6695,5 @@
 "Voulez-vous<br>continuer ?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -6826,5 +6701,5 @@
 "audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6834,5 +6709,5 @@
 "chemin ont été omis ou déplacés au début."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6886,5 +6761,5 @@
 msgstr "Convertir en calque GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6909,5 +6784,5 @@
 msgstr[1] "traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6915,5 +6790,5 @@
 msgstr[1] "points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6922,5 +6797,5 @@
 msgstr[1] "une trace avec {0} points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6929,5 +6804,5 @@
 msgstr[1] "{0} est constitué de {1} traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6936,9 +6811,9 @@
 msgstr[1] "{0} points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "marqueur gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6946,5 +6821,5 @@
 msgstr[1] "marqueurs"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6953,9 +6828,9 @@
 msgstr[1] "{0} est constitué de {1} marqueurs"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "Synchronizer l’audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -6964,5 +6839,5 @@
 "de synchronisation."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6970,14 +6845,14 @@
 msgstr "Fichier audio synchronisé au point {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 msgid "Unable to synchronize in layer being played."
 msgstr "Impossible de synchroniser dans le calque actuellemnt lu."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 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:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6987,5 +6862,5 @@
 "voulez le marqueur."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
@@ -6993,9 +6868,9 @@
 "décalage ."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Afficher/Masquer Texte/Icônes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Bascule l'état de visibilté du marqueur de texte et d'icônes."
@@ -7653,7 +7528,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
-#, fuzzy
 msgid "JOSM Plugin description URL"
-msgstr "Ajouter une description à l'URL des greffons de JOSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
@@ -8075,7 +7949,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8149,4 +8023,9 @@
 msgstr "Préparation des données..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "Impossible de lire \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -8158,7 +8037,69 @@
 msgstr "Impossible de lire \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Nota : la licence GPL est incompatible avec la licence  OSM. Ne pas charger "
+"de traces sous licence GPL."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "Fichiers GPX"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "description de la trace GPS"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Ajouter des informations sur l’auteur"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Nom réel"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Copyright (URL)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Prédéfini"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "Année du copyright"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Mots-clés"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Options d’export"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "Exporter et sauvegarder"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Erreur en exportant {0} :\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Choisir une licence prédéfinie"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -8188,4 +8129,9 @@
 "Erreur d'analyse syntaxique : la structure du document n’est pas valide pour "
 "un document gpx"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Rôle inconnu \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8328,7 +8274,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "Parcours du dossier {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8343,4 +8289,5 @@
 msgstr "Le serveur a renvoyé une erreur avec le code {0}"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8372,4 +8319,32 @@
 msgstr "Identifiant"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "Fichiers du serveur OSM"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8439,30 +8414,26 @@
 msgstr "Erreur pendant l’analyse syntaxique."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "Fichiers du serveur OSM"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Version inconnue"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr "Il manque le numéro de version dans les données OSM."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr "Version inconnue : {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr "Élément <nd> trouvé sur un non-chemin."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "<nd> n’a pas de ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "Élément <member> trouvé dans une non-relation."
@@ -8518,5 +8489,5 @@
 msgstr "Attribut requis manquant \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8525,9 +8496,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "Type de membre inconnu pour \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "Préparation des données de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "id du nœud mal formé"
@@ -8652,9 +8628,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
-"Attention - le chargment de {0} greffon a été demandé. Ce greffon n’est plus "
-"nécessaire."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8747,7 +8721,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "Pas d'information sur les greffons trouvée."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -9142,23 +9115,23 @@
 msgstr "Fichier vide trouvé dans le dossier {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Erreur lors de la récupération des fichiers du dossier {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr "Corréler en GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} ont été trouvées pour être géoétiquettées."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "Ouvrir les images avec AgPifoJ..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9414,5 +9387,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Erreur lors du chargement du fichier"
@@ -9461,30 +9434,13 @@
 msgstr "Sélectionner le tableau d'assemblage"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr "Enregistrement automatique de la source"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr "Projection invalide"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr "Changez auparavant la projection en {0}"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-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"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9498,9 +9454,9 @@
 "Voulez-vous réaffecter la touche F11 au téléchargement du cadastre ?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr "Restaurer la fontion de téléchargement à la touche F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM est arreté pour que la modification prenne effet."
@@ -9680,13 +9636,23 @@
 msgstr "Extraire les empreintes des bâtiments"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr "Téléchargement depuis le serveur WMS du Cadastre français"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Cadastre : {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+#, fuzzy
+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 cadastre WMS, modifiez\n"
+"la projection JOSM en Lambert et redémarrez"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9758,5 +9724,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr "Ajuster WMS"
@@ -10496,22 +10462,27 @@
 msgstr "Impossible d'acquérir l'image"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr "Connexion en cours"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr "Connecté"
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr "Pas connecté"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr "Échec de la connexion"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "nom"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10544,11 +10515,11 @@
 msgstr "Calque instrument LiveGPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
 msgstr "Capturer la trace GPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
@@ -10556,22 +10527,22 @@
 "LiveGPS."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center Once"
 msgstr "Centrer une fois"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center the LiveGPS layer to current position."
 msgstr "Centrer le calque LiveGPS sur la position actuelle."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr "Centrage automatique"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Centrer continuellement le calque LiveGPS sur la position actuelle."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -10827,24 +10798,24 @@
 msgstr "Actions permises"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Il a été demandé à Remote Control de charger les données depuis l'API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr "Request details: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr "Voulez-vous permettre celà?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr "Confirmer l’action Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -11086,10 +11057,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
+#, fuzzy, java-format
+msgid "{0} start"
 msgstr "début"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr "fin"
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} nœud"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11637,10 +11610,10 @@
 msgstr "Chemins se croisant"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr "Nœuds dupliqués"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
@@ -12350,9 +12323,33 @@
 msgstr "Pas d’URL WMS valide ou d’id"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr "Ajuster la position du calque WMS sélectionné"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "Veuille sélectionnez la rangée à éditer."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "Sauvegarder la couche WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Start adjusting"
+msgstr "Commencer la navigation"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "Aucun changement à envoyer."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -12367,15 +12364,15 @@
 msgstr "Téléchargement automatique"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Calque WMS ({0}), téléchargement automatique au zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Calque WMS ({0}), téléchargement au zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12384,37 +12381,37 @@
 "résolution."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Télécharger les tuiles visibles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Changer la résolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Recharger les tuiles erronées"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Canal alpha"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Sauvegarder un calque WMS dans un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr "Sauvegarder la couche WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "Charger un calque WMS depuis un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr "Charger la couche WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -12423,5 +12420,5 @@
 "attendue"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Erreur de format de fichier"
@@ -13059,5 +13056,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -15614,5 +15611,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15914,5 +15911,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -16015,5 +16012,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -20639,7 +20636,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "Route à accès réglementé"
+msgstr ""
 
 #. color tertiary
@@ -23818,5 +23814,5 @@
 msgstr "Village/Ville"
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23827,5 +23823,5 @@
 msgstr "Sens unique"
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23835,5 +23831,5 @@
 msgstr "Eglise"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23844,5 +23840,5 @@
 msgstr "Station essence"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23853,5 +23849,5 @@
 msgstr "Shopping"
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23861,5 +23857,5 @@
 msgstr "WC"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -24092,38 +24088,74 @@
 msgstr "Terraserver Urbain"
 
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Impossible d'initialiser l’API. Veuillez réessayer plus tard."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Échec d’initialisation de l’API"
-
-#~ 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 "No data"
-#~ msgstr "Aucune donnée"
-
-#~ msgid "Update failed"
-#~ msgstr "La mise à jour a échoué"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Primitive manquante"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Appliquer la résolution partielle"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Calques: {0}"
-
-#~ msgid "Conflict created"
-#~ msgstr "conflit créé"
-
-#~ 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 "Unknown file extension."
+#~ msgstr "Extension de fichier inconnue."
+
+#~ msgid "Move"
+#~ msgstr "Déplacer"
+
+#~ msgid "Invalid projection"
+#~ msgstr "Projection invalide"
+
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Changez auparavant la projection en {0}"
+
+#~ msgid "end"
+#~ msgstr "fin"
+
+#~ msgid "Data Layer"
+#~ msgstr "Calque de données"
+
+#~ msgid "Not implemented yet."
+#~ msgstr "Pas encore implémenté."
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Résoudre les conflits"
+
+#~ msgid "Object"
+#~ msgstr "Objet"
+
+#~ 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 "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 "unnamed"
+#~ msgstr "sans-nom"
+
+#~ msgid "Validate"
+#~ msgstr "Valider"
 
 #~ msgid ""
@@ -24134,64 +24166,4 @@
 #~ "avez obtenu JOSM."
 
-#~ msgid "Validate"
-#~ msgstr "Valider"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr ""
-#~ "Valider soit la sélection actuelle, soit toutes les données téléchargées."
-
-#~ msgid "Data Layer"
-#~ msgstr "Calque de données"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Pas encore implémenté."
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Résoudre les conflits"
-
-#~ msgid "Object"
-#~ msgstr "Objet"
-
-#~ 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 "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 "unnamed"
-#~ msgstr "sans-nom"
-
 #~ msgid "Occupied By"
 #~ msgstr "Occupé par"
@@ -24212,4 +24184,8 @@
 #~ "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."
+#~ msgstr ""
+#~ "Valider soit la sélection actuelle, soit toutes les données téléchargées."
 
 #~ msgid "Metacarta Map Rectifier image id"
@@ -24446,4 +24422,8 @@
 #~ 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"
@@ -24458,4 +24438,7 @@
 #~ "Rétablir l’état des objets actuellement sélectionnés à la version "
 #~ "préalablement sélectionnée dans la liste de l’historique."
+
+#~ msgid "Layers: {0}"
+#~ msgstr "Calques: {0}"
 
 #~ msgid "Login name (email) to the OSM account."
@@ -24547,7 +24530,4 @@
 #~ msgid "Oberpfalz Geofabrik.de"
 #~ msgstr "Haut Palatinat Geofabrik.de"
-
-#~ msgid "Start routing"
-#~ msgstr "Commencer la navigation"
 
 #~ msgid "Remove route nodes"
@@ -24604,4 +24584,7 @@
 #~ "éléments lorsque les choix de fusion seront appliqués."
 
+#~ msgid "Apply partial resolutions"
+#~ msgstr "Appliquer la résolution partielle"
+
 #~ msgid "WARNING: unexpected value for preference conflict.resolution, got "
 #~ msgstr ""
@@ -24616,4 +24599,7 @@
 #~ msgid "Undeleting Way..."
 #~ msgstr "Restauration du chemin..."
+
+#~ msgid "Update failed"
+#~ msgstr "La mise à jour a échoué"
 
 #~ msgid "Keep mine"
@@ -24653,4 +24639,7 @@
 #~ msgstr "La sélection est trop large"
 
+#~ msgid "Missing primitive"
+#~ msgstr "Primitive manquante"
+
 #~ msgid "Error when communicating with server."
 #~ msgstr "Erreur de communication avec le serveur"
@@ -24666,4 +24655,23 @@
 #~ msgstr "Pas de primitive historisée d’id {0} dans ce jeu de données"
 
+#~ 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 "Failed to initialize API. Please try again later."
+#~ msgstr "Impossible d'initialiser l’API. Veuillez réessayer plus tard."
+
+#~ msgid "API initialization failed"
+#~ msgstr "Échec d’initialisation de l’API"
+
 #~ msgid "image loading..."
 #~ msgstr "chargement de l’image..."
+
+#~ msgid "No data"
+#~ msgstr "Aucune donnée"
+
+#~ msgid "Conflict created"
+#~ msgstr "conflit créé"
Index: /applications/editors/josm/i18n/po/gl.po
===================================================================
--- /applications/editors/josm/i18n/po/gl.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/gl.po	(revision 16973)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
 "PO-Revision-Date: 2009-06-27 15:34+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,13 +16,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:34+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -47,15 +40,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -80,7 +65,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -88,4 +73,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -107,8 +96,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Erro"
@@ -119,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Cambios non gardados"
@@ -137,16 +128,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -158,13 +148,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -181,4 +172,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "Cancelar"
@@ -192,5 +184,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -199,5 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -208,23 +201,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -245,5 +238,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr ""
@@ -277,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -308,5 +301,5 @@
 msgstr "Informes de Erro"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -367,19 +360,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Por favor seleccione a fila a borrar."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Seleccionar ou ben:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "Acoplar Nodos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -418,5 +408,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -449,18 +439,18 @@
 msgstr "Lonxitude"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Alinear os nodos en círculo"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Mover os nodos seleccionados a un círculo."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -489,18 +479,18 @@
 msgstr "Ferramenta: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Por favor, selecciona polo menos catro nodos."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -513,5 +503,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -634,13 +624,13 @@
 msgstr "Combinar varias vías en unha."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Por favor, selecciona polo menos dúas vías para combinar."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -648,13 +638,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "Combinar de todas formas"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Cambiar direccións?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -664,9 +654,9 @@
 "invertir algunhas?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Invertir e Combinar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -675,5 +665,5 @@
 msgstr "Introducir valores para todos os conflitos."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -681,14 +671,14 @@
 msgstr "Resolver Conflitos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combinar {0} vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "Todas as vías están vacías"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -707,24 +697,23 @@
 msgstr "Copiar os obxectos seleccionados ó buffer de pegado."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Por favor, selecciona algo para copiar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Crear Círculo"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Crear un círculo a partir de tres nodos seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "Eses nodos non estan en un círculo"
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -736,8 +725,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -757,15 +746,15 @@
 msgstr "Borrar obxectos seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Sobrescribir"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "O ficheiro existe. Sobrescribir?"
@@ -827,5 +816,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -835,7 +824,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "Erros durante a descarga"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -846,5 +834,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Duplicar"
@@ -868,92 +857,36 @@
 msgstr "Sair da aplicación,"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Nota: GPL non é compatible coa licenza OSM. Non suba trazados con licenza "
-"GPL."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Exportar a GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Exportar os datos a un ficheiro GPX."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Nada que exportar. Adquire antes algún dato."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "descripción de trazado gps"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Engadir información do autor"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Nome real"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Copyright (URL)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Predefinido"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "Ano do Copyright"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Palabras clave"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Opcións de exportacińo"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "Exportar e Gardar"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Erro durante a exportación {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Escoller unha licencia predefinida"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "Exportar os datos a un ficheiro GPX."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -969,6 +902,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1041,5 +974,5 @@
 msgstr "Unir un nodo ós segmentos de vía máis próximos"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "Unir Nodo e Liña"
@@ -1050,12 +983,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Acoplar de todas formas"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "Combinar a capa inmediatamente inferior coa capa seleccionada."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1099,12 +1030,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "selección"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Actualiza as primitiva seleccionadas actualmente dende o servidor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1164,5 +1093,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "Nova"
@@ -1238,5 +1167,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
-#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1244,7 +1172,4 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 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?"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1258,5 +1183,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Pegar"
@@ -1268,5 +1193,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Pegar Etiquetas"
@@ -1315,7 +1240,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Non se puido renomear o ficheiro \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1352,5 +1277,10 @@
 msgstr "O arquivo {0} existe. Sobreescribir?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "Non hai documentos abertos, polo que non hai nada que gardar."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1360,25 +1290,25 @@
 "favor, informa disto como un erro."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "Non hai documentos abertos, polo que non hai nada que gardar."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Documento valeiro"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "O documento non contén datos."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "Gardar de todas formas"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Conflitos"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1388,59 +1318,19 @@
 "como se os rexeitases todos. Continuar?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "Rexeitar Conflitos e Gardar"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "Gardar ficheiro OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "Gardar ficheiro GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "Gardar Capa"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Non se puido facer copia de seguridade do ficheiro."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Extensión de ficheiro descoñecida: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr "Ocurriu un erro mentres se gardaba."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr ""
-"Produciuse un erro mentras se restauraba o ficheiro de copia de seguridade."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Extensión de ficheiro descoñecida."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "Ocurriu un erro mentres se gardaba."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr ""
-"Produciuse un erro mentras se restauraba o ficheiro de copia de seguridade."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1555,5 +1445,5 @@
 "nodos no medio da vía.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1561,5 +1451,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1567,5 +1457,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1711,7 +1601,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
-#, fuzzy
 msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr "Non se puido atopar a primitiva coa id {0} no paquete de datos actual"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
@@ -1835,7 +1724,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "SIbir todos os cambios ó servidor OSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1993,12 +1881,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "Subindo datos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr "Ocurriron os seguintes erros durante a descarga masiva:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -2038,5 +1925,5 @@
 msgstr "Modo: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2046,6 +1933,6 @@
 "nodos sen usar cando se borre unha vía. Ctrl: borrar obxectos aludidos."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2056,8 +1943,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2102,38 +1989,38 @@
 msgstr "seleccionado"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "Non se pode engadir un nodo fora do mundo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Engadir nodo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Engadir nodo na vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "Conectar via existente a nodo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Engadir un novo nodo a unha via existente"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "Engadir nodo a vía e conectar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "Crear novo nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "Seleccionar nodo baixo o cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2142,14 +2029,14 @@
 msgstr[1] "Insertar novo nodo en {0} vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "Comezar nova vía a partir do último nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "Continuar vía a partir do último nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "Rematar debuxo."
@@ -2169,5 +2056,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Soltar o botón do rato para seleccionar os obxectos do rectángulo."
@@ -2179,5 +2066,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "Soltar o botón do rato para deter a rotación."
@@ -2214,9 +2101,9 @@
 msgstr[1] "Engadir e mover un novo nodo virtual a {0} vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2226,13 +2113,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2241,5 +2128,5 @@
 "próximo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2469,26 +2356,26 @@
 "relación"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr "Faltan argumentos para OR."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr "Faltan argumentos para NOT."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "Esperabase parentese de peche."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Número de parámetros incorrecto para o operador nodes."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2499,5 +2386,5 @@
 "de nodos ou un rango, por exemplo nodes:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2587,8 +2474,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Solucionar Conflito"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2600,10 +2486,10 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "Non se atoparon coincidencias para \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2647,5 +2533,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "Borrar da relación"
@@ -2660,5 +2546,5 @@
 "Borrar da relación?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr "Separar segmento de vía"
@@ -2666,5 +2552,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2676,8 +2563,7 @@
 "estar usandoos.<br>Queres borralos realmente?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "Borrar da relación"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2687,9 +2573,227 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Mover"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "Acoplar {0} nodos"
+msgstr[1] "Acoplar {0} nodos"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr "Purgando 1 primitiva"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+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}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr "Resolver conflitos na lista de membros da relación {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "{0} nodo"
+msgstr[1] "{0} nodos"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Secuencia"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "Resolver {0} conflitos de etiquetas en {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr "Desfacer o borrado de {0} primitivas"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr "Resolver conflitos de versión para {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr "Resolver conflitos na lista de nodos da vía {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Aplicar?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"Cando se invirta esta vía, os seguintes cambios en propiedades da vía e nos "
+"seus nodos son suxeridos para manter a consistencia dos datos."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Relación"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Papel antigo"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "Novo papel"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Clave antiga"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Valor antigo"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Nova clave"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "Novo valor"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Aplicar os cambios seleccionados"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Non aplicar cambios"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "Por favor, selecciona que cambios de propiedade queres aplicar."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Propiedades de "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr "Papeis nas relacións que fan referencia a"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Corrección"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Ficheiro de configuración mal formado nas liñas {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Non se pode abrir o directorio de preferencias: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+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}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Preferencias almacenadas en {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Non se puideron subir as preferencias. Razón: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "Non se puideron cargar as preferencias dende o servidor."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "Grados Decimais"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "Grados Minutos Segundos"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "O"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "E"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "Cambiar {0} obxecto"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr "Requírese o parámetro {0} > 0. Obtívose {1}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "incompleto"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2703,214 +2807,4 @@
 msgstr[1] "nodos"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr "Purgando 1 primitiva"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-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}"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr "Resolver conflitos na lista de membros da relación {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Secuencia"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "Resolver {0} conflitos de etiquetas en {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr "Desfacer o borrado de {0} primitivas"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "Resolver conflitos de versión para {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr "Resolver conflitos na lista de nodos da vía {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Aplicar?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"Cando se invirta esta vía, os seguintes cambios en propiedades da vía e nos "
-"seus nodos son suxeridos para manter a consistencia dos datos."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "Relación"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "Papel antigo"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "Novo papel"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Clave antiga"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Valor antigo"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Nova clave"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "Novo valor"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "Aplicar os cambios seleccionados"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "Non aplicar cambios"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "Por favor, selecciona que cambios de propiedade queres aplicar."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "Propiedades de "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr "Papeis nas relacións que fan referencia a"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "Corrección"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Ficheiro de configuración mal formado nas liñas {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Non se pode abrir o directorio de preferencias: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-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}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Preferencias almacenadas en {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Non se puideron subir as preferencias. Razón: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "Non se puideron cargar as preferencias dende o servidor."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "Grados Decimais"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "Grados Minutos Segundos"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "O"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "E"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "Requírese o parámetro {0} > 0. Obtívose {1}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "incompleto"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2942,5 +2836,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2973,5 +2867,5 @@
 msgstr "o parámetro \"{0}\" non é unha clase aceptable, obtivose \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -2980,22 +2874,22 @@
 msgstr[1] "{0} membros"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "Carretera"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "Vía férrea"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "Vía acuática"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -3063,10 +2957,12 @@
 msgstr "a vía multipoligonal \"{0}\" non está pechada."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "Membro vacío na relación."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3074,5 +2970,5 @@
 msgstr "Membro \"{0}\" borrado na relación."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3080,57 +2976,57 @@
 msgstr "Vía \"{0}\" con menos de dous puntos."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr "Atopadas máis de unha vía \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr "Atopadas máis de unha vía \"ata\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr "Atopouse máis de un \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Papel \"{0}\" descoñecido."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo de membro descoñecido para \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr "Non se atoparon vias \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr "Non se atoparon vías \"ata\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr "Ningún nodo o vía \"vía\" atopados."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 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\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 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\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3182,5 +3078,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3214,4 +3110,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3246,13 +3146,25 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "Non se puideron ler os marcadores."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "Non se puido escribir o marcador."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3290,4 +3202,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3319,16 +3232,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "Excepción Inesperada"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
 msgstr ""
-"Non se puido conectar co servidor osm. Por favor revisa a túa conexión a "
-"internet."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3337,5 +3247,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -3343,6 +3253,4 @@
 "preferences and your internet connection.</html>"
 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."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
@@ -3562,6 +3470,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3590,39 +3498,39 @@
 msgstr "Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "Mover á dereita"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Mapa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "Mover á esquerda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Mover cara arriba"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Mover cara abaixo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "Aumentar Zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Reducir Zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "escalar"
@@ -3656,10 +3564,10 @@
 msgstr "(sen obxecto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "a capa non está na lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3744,12 +3652,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3758,6 +3666,6 @@
 msgstr "Etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3765,47 +3673,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#, java-format
+msgid "{0} pending tag conflicts to be resolved"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
-#, java-format
-msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3813,25 +3721,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
@@ -4031,8 +3939,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4253,5 +4161,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4264,5 +4172,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4297,6 +4205,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4309,6 +4217,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4379,7 +4287,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4444,7 +4352,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Gardar de todas formas"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4471,7 +4378,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Resolver conflitos de versión para {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4521,98 +4428,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Capas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Abrir unha lista de todas as capas cargadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Borrar a capa seleccionada."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "Existen cambios sen gardar. Borrar a capa igualmente?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "Borrar Capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "Desexas realmente borrar a capa completa?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Información"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Borrar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "Borrar {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Amosar/Ocultar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Cambiar o estado visible da capa seleccionada."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "Inactivo"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "Borrar a capa seleccionada."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "Combinar a capa inmediatamente inferior coa capa seleccionada."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Mover a capa seleccionada unha fila cara arriba."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Mover a capa seleccionada unha fila cara abaixo."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "Máis información acerca desta característica"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4621,22 +4522,22 @@
 msgstr[1] "Esto cambiará ata {0} obxectos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "Un valor vacío borra a clave."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Cambiar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4644,5 +4545,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4651,50 +4552,41 @@
 msgstr[1] "Cambiar as propiedades de ata {0} obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Por favor, selecciona unha tecla"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Por favor selecciona un valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 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/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Propiedades dos obxectos seleccionados."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "Membro de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "Cambiar relación"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, 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/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "Engadir Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4711,63 +4603,77 @@
 msgstr "Engadir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 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/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "Editar Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 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/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "Cambiar relación"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, 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/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "Borrar a clave seleccionada en todos os obxectos"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "Borrar Propiedades"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "Borrar a clave seleccionada en todos os obxectos"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr ""
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Relacións"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "Abrir unha lista con todas as relacións."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relacións: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Abrir un editor para a relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Borrar a relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Crear unha nova relación"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4798,5 +4704,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4867,5 +4773,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -4876,21 +4782,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "Área de Descarga"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "Borrar a relación seleccionada"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Descargar Lugar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr ""
@@ -4909,17 +4812,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "Relacións"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "Descargando datos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -4937,7 +4839,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "Relacións"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -4948,9 +4849,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -4959,15 +4860,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "Refacer a última acción desfeita."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -4977,9 +4877,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -4989,15 +4889,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5005,5 +4905,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5011,66 +4911,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
+msgid "Remove all members referring to one of the selected primitives"
+msgstr ""
+
+#. putValue(NAME, tr("Remove Selected"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Relation Editor: Remove Selected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #, fuzzy
-msgid "Remove all members referring to one of the selected primitives"
-msgstr "Fallou ao actualizar as primitivas seleccionadas."
-
-#. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
-msgid "Relation Editor: Remove Selected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Select primitives for selected relation members"
+msgstr "Borrar a relación seleccionada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "Mover os membros actualmente seleccionados cara arriba"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "Mover os membros seleccionados actualmente cara abaixo"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Eliminar da relación todos os obxectos seleccionados actualmente"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "Borrar a relación seleccionada"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr "Non, cancelar a operación"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5079,10 +4993,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "Relación contradictoria"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -5091,21 +5004,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Gardar os datos actuais."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5115,37 +5027,37 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Descargar todas as vías e nodos incompletos na relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "Descargar Membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5155,30 +5067,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Reducir Zoom"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "Mover os membros seleccionados actualmente cara abaixo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5239,7 +5145,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "Cargar Selección"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -5273,7 +5178,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "engadir á selección"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6408,5 +6312,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Imaxes xeo-etiquetadas"
@@ -6432,5 +6336,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6449,5 +6353,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "imaxes JPEG (*.jpg)"
@@ -6485,43 +6389,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "punto gps"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Personalizar debuxo de liñas"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Usar configuración global."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Debuxar liñas entre puntos para esta capa."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Non debuxar liñas entre puntos para esta capa."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Seleccionar as opcións de liña do debuxo"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Personalizar Cor"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6529,6 +6433,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6602,10 +6506,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Convertir en capa de datos"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6616,11 +6520,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6629,29 +6533,29 @@
 msgstr "Convertido de: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "Descargar todo o que abarca:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "Área máxima por petición:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km cad."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6662,9 +6566,9 @@
 "Desexas<br>continuar?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 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:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6672,5 +6576,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6722,5 +6626,5 @@
 msgstr "Convertir a capa GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6745,5 +6649,5 @@
 msgstr[1] "trazados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6751,5 +6655,5 @@
 msgstr[1] "puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6758,5 +6662,5 @@
 msgstr[1] "un trazado con {0} puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6765,5 +6669,5 @@
 msgstr[1] "{0} componse de {1} trazados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6772,9 +6676,9 @@
 msgstr[1] "{0} puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "marca gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6782,5 +6686,5 @@
 msgstr[1] "marcas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6789,9 +6693,9 @@
 msgstr[1] "{0} componse de {1} marcas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "Sincronizar Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -6799,5 +6703,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:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6805,14 +6709,14 @@
 msgstr "Audio sincronizado no punto {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 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:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6820,13 +6724,13 @@
 msgstr "Debes ter pausado o audio no punto da pista onde queres a marca."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Amosar/Ocultar Texto/Iconas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Cambiar o estado visible do texto e iconas da marca."
@@ -7885,7 +7789,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -7957,4 +7861,9 @@
 msgstr "Preparando datos..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "Non se puido ler \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -7966,7 +7875,69 @@
 msgstr "Non se puido ler \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Nota: GPL non é compatible coa licenza OSM. Non suba trazados con licenza "
+"GPL."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "Ficheiros GPX"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "descripción de trazado gps"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Engadir información do autor"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Nome real"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Copyright (URL)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Predefinido"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "Ano do Copyright"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Palabras clave"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Opcións de exportacińo"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "Exportar e Gardar"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Erro durante a exportación {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Escoller unha licencia predefinida"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -7994,4 +7965,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Erro de análise: estrutura de documento non válida para documento gpx"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Papel \"{0}\" descoñecido."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8126,7 +8102,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "Estilo de pintura {0}: {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8141,4 +8117,5 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8170,4 +8147,32 @@
 msgstr "Inicio de sesión"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "Ficheiros de Servidor OSM"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8225,30 +8230,26 @@
 msgstr "Erro durante a análise."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "Ficheiros de Servidor OSM"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Versión descoñecida"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr "Falta o número de versión dos datos do OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr "Versión descoñecida: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr "Atopouse un elemento <nd> no que non é unha vía."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "<nd> ten referencia cero"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "Atopouse un elemento <member> no que non é unha relación."
@@ -8298,5 +8299,5 @@
 msgstr "Falta o atributo obrigatorio \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8305,9 +8306,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "Tipo de membro descoñecido para \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "Preparar os datos de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "ID de nodo mal formada"
@@ -8432,9 +8438,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "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."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8525,7 +8529,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "Non se atopou información de engadidos."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8905,23 +8908,23 @@
 msgstr "Atopouse un ficheiro nulo no directorio {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Erro obtendo ficheiros do directorio {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "Abrir imaxes con AgPifoJ..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9160,5 +9163,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Erro cargando ficheiro"
@@ -9205,28 +9208,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the JOSM projection to Lambert and restart"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9235,9 +9223,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
@@ -9399,12 +9387,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
 msgstr ""
 
@@ -9472,5 +9467,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr ""
@@ -10182,22 +10177,27 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr ""
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "nome"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10230,32 +10230,32 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+msgid "Capture GPS Track"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+msgid "Center Once"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+msgid "Center the LiveGPS layer to current position."
+msgstr ""
+
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
-msgid "Capture GPS Track"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
-msgid "Center Once"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
-msgid "Center the LiveGPS layer to current position."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
 msgid "Auto-Center"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr ""
@@ -10491,24 +10491,24 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -10747,10 +10747,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
-msgstr ""
+#, fuzzy, java-format
+msgid "{0} start"
+msgstr "{0} metros"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr ""
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} nodo"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11273,10 +11275,10 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
@@ -11938,9 +11940,32 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "Por favor selecciona a fila a editar."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "Borrar Capa"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+msgid "Start adjusting"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "Non hai cambios que subir."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11953,57 +11978,57 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Gardar capa WMS nun ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "Cargar capa WMS dende ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Versión de ficheiro WMS non soportado; atopouse {0}, esperabase {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Erro de Formato de Ficheiro"
@@ -12585,5 +12610,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -15140,5 +15165,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15440,5 +15465,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15541,5 +15566,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -23343,5 +23368,5 @@
 msgstr ""
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23352,5 +23377,5 @@
 msgstr ""
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23360,5 +23385,5 @@
 msgstr ""
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23369,5 +23394,5 @@
 msgstr ""
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23378,5 +23403,5 @@
 msgstr ""
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23386,5 +23411,5 @@
 msgstr ""
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23617,22 +23642,139 @@
 msgstr ""
 
+#~ msgid "Unknown file extension."
+#~ msgstr "Extensión de ficheiro descoñecida."
+
+#~ msgid "Move"
+#~ msgstr "Mover"
+
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
 #~ msgstr ""
-#~ "Non se atoparon datos para actualizar. Abriches ou descargaches xa unha "
-#~ "capa de datos?"
-
-#~ msgid "Update failed"
-#~ msgstr "Actualización fallida"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Primitiva desaparecida"
+#~ "O servidor devolveu un erro interno. Intentao cunha área máis reducida ou "
+#~ "logo de esperar un tempo."
+
+#~ 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 "Aborting..."
+#~ msgstr "Abortando..."
+
+#~ msgid ""
+#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
+#~ "move mouse.   Select: Click."
+#~ 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 "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ 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 "Basic"
+#~ msgstr "Básico"
+
+#~ 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 "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 "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"
+
+#~ msgid "Object"
+#~ msgstr "Obxecto"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Revert"
+#~ msgstr "Revertir"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ 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 "Layers: {0}"
 #~ msgstr "Capas: {0}"
 
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Eliminar o membro da fila actual desta relación"
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Nome de inicio de sesión (correo-e) da conta OSM."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "Nome de usuario OSM (correo-e)"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Fonte de etiquetado preestablecido"
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Fontes de etiquetado preestablecido."
+
+#~ msgid "Add either site-josm.xml or Wiki Pages."
+#~ msgstr "Engadir ou site-josm.xml ou as páxinas Wiki."
+
+#~ 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 "{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 "Plugin requires JOSM update: {0}."
+#~ msgstr "O engadido require a actualización de JOSM: {0}."
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Non se puido descargar o engadido: {0} de {1}"
 
 #~ msgid ""
@@ -23642,128 +23784,4 @@
 #~ "O engadido non puido ser eliminado. Por favor, comentalle o problema á "
 #~ "xente que che propocionou JOSM."
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "O servidor devolveu un erro interno. Intentao cunha área máis reducida ou "
-#~ "logo de esperar un tempo."
-
-#~ 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 "Aborting..."
-#~ msgstr "Abortando..."
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ 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 "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ 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 "Basic"
-#~ msgstr "Básico"
-
-#~ 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 "Move Down"
-#~ msgstr "Mover cara abaixo"
-
-#~ 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"
-
-#~ msgid "Object"
-#~ msgstr "Obxecto"
-
-#~ msgid "Date"
-#~ msgstr "Data"
-
-#~ msgid "Revert"
-#~ msgstr "Revertir"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ 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 "Login name (email) to the OSM account."
-#~ msgstr "Nome de inicio de sesión (correo-e) da conta OSM."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "Nome de usuario OSM (correo-e)"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Fonte de etiquetado preestablecido"
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Fontes de etiquetado preestablecido."
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Engadir ou site-josm.xml ou as páxinas Wiki."
-
-#~ 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 "{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 "Plugin requires JOSM update: {0}."
-#~ msgstr "O engadido require a actualización de JOSM: {0}."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Non se puido descargar o engadido: {0} de {1}"
 
 #~ msgid "Error deleting plugin file: {0}"
@@ -23826,4 +23844,11 @@
 #~ msgid "unnamed"
 #~ msgstr "sen nome"
+
+#~ 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 ""
@@ -23912,4 +23937,10 @@
 #~ msgstr "Selección demasiado grande"
 
+#~ msgid "Missing primitive"
+#~ msgstr "Primitiva desaparecida"
+
+#~ msgid "Update failed"
+#~ msgstr "Actualización fallida"
+
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Solucionar {0} conflitos en {1} obxectos"
Index: /applications/editors/josm/i18n/po/he.po
===================================================================
--- /applications/editors/josm/i18n/po/he.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/he.po	(revision 16973)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-08-02 16:36+0000\n"
-"Last-Translator: mrli <Unknown>\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-04 10:56+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,13 +16,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:35+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -47,15 +40,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -80,7 +65,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -88,4 +73,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -107,8 +96,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "שגיאה"
@@ -119,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "שינויים לא שמורים"
@@ -137,16 +128,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -158,13 +148,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -181,4 +172,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "ביטול"
@@ -192,5 +184,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -199,5 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -208,23 +201,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -245,5 +238,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "אזהרה"
@@ -277,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -308,5 +301,5 @@
 msgstr "דיווחי תקלות"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -367,19 +360,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "נא בחר את השורה למחיקה."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "בחר:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "מיזוג צמתים"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -418,5 +408,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -449,18 +439,18 @@
 msgstr "קו אורך"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "סדר את הצמתים בעיגול"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "העבר את הצמתים הנבחרים לעיגול."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -489,18 +479,18 @@
 msgstr "כלי: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "נא בחר לפחות ארבעה צמתים."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -513,5 +503,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -636,13 +626,13 @@
 msgstr "שלב מספר דרכים לאחת."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "נא בחר לפחות שתי דרכים לשילוב."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "לשלב שתי דרכים בעלות חברויות שונות?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -650,13 +640,13 @@
 msgstr "לדרכים הנבחרות ישנם יחסים משתנים. האם אתה עדיין מעוניין לשלב ביניהם?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "אחד בכל זאת"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "לשנות כיוונים?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -664,9 +654,9 @@
 msgstr "לא ניתן לשלב את הדרכים בכיווניהם הנוכחיים. האם ברצונך להפוך כמה מהם?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "הפוך כיוון ואחד"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -675,5 +665,5 @@
 msgstr "הזן ערכים לכל ההתנגשויות."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -681,14 +671,14 @@
 msgstr "פתור התנגשויות"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "שלב {0} דרכים"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "כל הדרכים היו ריקות"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -705,24 +695,23 @@
 msgstr "העתק את הפריטים הנבחרים אל חוצץ ההדבקה."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "אנא בחר דבר מה להעתקה."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "צור עיגול"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "צור עיגול משלושה צמתים נבחרים"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "צמתים אלה אינם בעיגול."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -734,8 +723,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -755,15 +744,15 @@
 msgstr "מחק את הפריטים הנבחרים."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "שכתוב"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "הקובץ כבר קיים. לשכתב?"
@@ -824,5 +813,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -832,7 +821,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "שגיאות במהלך הורדה"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -843,5 +831,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "שכפל"
@@ -865,90 +854,36 @@
 msgstr "צא מהיישום."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr "הערה: GPL אינו תואם לרשיון של OSM. אל תעלה מסלולים שרשיונם GPL."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "ייצא ל-GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "ייצא נתונים לקובץ GPX."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "אין מה לייצא. השג נתונים תחילה."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "תיאור מסלול GPS"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "הוסף מידע על היוצר"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "שם אמיתי"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "זכויות יוצרים (כתובת)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "מוגדר מראש"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "שנת זכויות היוצרים"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "מילות מפתח"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "אפשרויות ייצוא"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "ייצא ושמור"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"שגיאה בזמן ייצוא {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "בחר רשיון המוגדר מראש"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "ייצא נתונים לקובץ GPX."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -964,6 +899,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1034,5 +969,5 @@
 msgstr "צרף צומת למקטעי הדרך הקרובים ביותר"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "צרף צומת וקו"
@@ -1043,12 +978,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "מזג בכל זאת"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "מזג את השכבה מתחת לתוך השכבה הבחורה."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1091,12 +1024,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "בחירה"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "הזז מטה את החברים שנבחרו"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1156,5 +1087,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "חדש"
@@ -1245,5 +1176,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "הדבק"
@@ -1255,5 +1186,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "הדבק תגיות"
@@ -1300,7 +1231,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "לא ניתן לשנות את שם הקובץ \"{0}\"."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1337,5 +1268,10 @@
 msgstr "הקובץ {0} כבר קיים. לדרוס אותו?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "אין כל מסמך פתוח ולכן אין מה לשמור."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1344,25 +1280,25 @@
 "שגיאה פנימית: לא ניתן לבדוק תנאים לשכבה שלא נבחרה. אנא דווח על זאת כעל תקלה."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "אין כל מסמך פתוח ולכן אין מה לשמור."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "מסמך ריק"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "המסמך לא מכיל נתונים"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "שמור בכל זאת"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "התנגשויות"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1372,57 +1308,19 @@
 "להמשיך?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "דחה התנגשויות ושמור"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "שמור קובץ OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "שמור קובץ GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "שמור שכבה"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "לא יכול לגבות קובץ."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "סיומת קובץ לא מוכרת: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr "אירעה שגיאה במהלך שמירה"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr "אירעה שגיאה במהלך שחזור קובץ גיבוי."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "סיומת הקובץ אינה ידועה."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "אירעה שגיאה במהלך שמירה"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr "אירעה שגיאה במהלך שחזור קובץ גיבוי."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1528,5 +1426,5 @@
 msgstr "הדרך לא יכולה להתפצל בנקודות שנבחרו. (טיפ: בחר נקודות בתוך הדרך.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1534,5 +1432,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1540,5 +1438,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1671,7 +1569,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
-#, fuzzy
 msgid "No current dataset found"
-msgstr "לא נמצאה שכבת נתוני GPX"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
@@ -1784,7 +1681,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "העלה את כל השינויים לשרת ה-OSM"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1942,12 +1838,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "מעלה נתונים"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr "השגיאות הבאות הרעו במהלך הורדה המונית:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -1987,5 +1882,5 @@
 msgstr "נקודה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -1995,6 +1890,6 @@
 "דרך. Ctrl: מחק פריטים מפנים."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2005,8 +1900,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2051,38 +1946,38 @@
 msgstr "נבחר"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "לא ניתן להוסיף צומת מחוץ לעולם"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "הוסף צומת"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "הוסף צומת לדרך"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "חבר דרך קיימת לצומת"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "הוסף צומת חדש לדרך קיימת"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "הוסף צומת לדרך וחבר"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "יוצר נקודה חדשה."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "בחר את הנקודה שמתחת לסמן."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2091,14 +1986,14 @@
 msgstr[1] "הוסף נקודה חדשה ל-{0} דרכים."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "התחל דרך חדשה מהנקודה האחרונה."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "המשך דרך מהנקודה האחרונה."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "הפסק לצייר."
@@ -2118,5 +2013,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "שחרר את לחצן העכבר לבחירת פריטים במרובע."
@@ -2127,5 +2022,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "שחרר את סמן העכבר להפסקת ההטייה"
@@ -2162,9 +2057,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2174,13 +2069,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2188,5 +2083,5 @@
 "שחרר את לחצן העכבר הימני להפסקת ההזזה. Ctrl למיזוג עם הצומת הקרוב ביותר."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2405,26 +2300,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr "חסרים ארגומנטים ל-or."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr "חסרים ארגומנטים ל-not."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "ציפיתי לסוגר סוגריים."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr "מספר שגוי של פרמטרים עבור פעולה על נקודה."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2433,5 +2328,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2521,8 +2416,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "פתור התנגשויות"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2534,10 +2428,10 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "לא נמצאה התאמה עבור \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2579,5 +2473,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "מחק מיחס"
@@ -2590,5 +2484,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr "פצל קטע דרך"
@@ -2596,5 +2490,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2605,8 +2500,7 @@
 "אחרים {שאתה לא רואה) עשויים להשתמש בהם.<br>האם אתה באמת רוצה למחוק?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "מחק מיחס"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2616,9 +2510,221 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "הזז"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "מזג {0} צמתים"
+msgstr[1] "מזג {0} צמתים"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "נקודה {0}"
+msgstr[1] "{0} נקודות"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "רצף"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "פתור התנגשות התווית {0} ב-{1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr "פתור התנגשות גירסאות ב-{0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr "פתור התנגשויות רשימת הנקודות בדרך {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "החל?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "יחס"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "תפקיד ישן"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "תפקיד חדש"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "מפתח ישן"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "ערך ישן"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "מפתח חדש"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "ערך חדש"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "החל את השינויים שנבחרו"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "אל תחל את השינויים"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "בחר אילו שינויי תכונות אתה רוצה להחיל."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "מאפיינים של ‏ "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "תיקון תוויות אוטומטי"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "קובץ תצורה לא תקין בשורות {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "לא ניתן לפתוח את תיקיית ההעדפות: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr "קובץ המאפיינים מכיל שגיאות. מגבה קובץ ישן ל {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "מאפיינים נשמרו ב {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "לא יכול להעלות מאפיינים. סיבה: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "לא יכול לטעון מאפיינים משרת."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "מעלות עשרוניות"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "מעלות דקות שניות"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "דרום"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "צפון"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "מערב"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "מזרח"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "שנה עצם {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "לא גמור"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2632,208 +2738,4 @@
 msgstr[1] "צמתים"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "רצף"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "פתור התנגשות התווית {0} ב-{1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "פתור התנגשות גירסאות ב-{0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr "פתור התנגשויות רשימת הנקודות בדרך {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "החל?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "יחס"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "תפקיד ישן"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "תפקיד חדש"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "מפתח ישן"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "ערך ישן"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "מפתח חדש"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "ערך חדש"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "החל את השינויים שנבחרו"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "אל תחל את השינויים"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "בחר אילו שינויי תכונות אתה רוצה להחיל."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "מאפיינים של ‏ "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "תיקון תוויות אוטומטי"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "קובץ תצורה לא תקין בשורות {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "לא ניתן לפתוח את תיקיית ההעדפות: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr "קובץ המאפיינים מכיל שגיאות. מגבה קובץ ישן ל {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "מאפיינים נשמרו ב {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "לא יכול להעלות מאפיינים. סיבה: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "לא יכול לטעון מאפיינים משרת."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "מעלות עשרוניות"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "מעלות דקות שניות"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "דרום"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "צפון"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "מערב"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "מזרח"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "לא גמור"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2865,5 +2767,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2896,5 +2798,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -2903,22 +2805,22 @@
 msgstr[1] "{0} חברים"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "כביש ראשי"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "מסילת רכבת"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "נתיב מים"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -2983,10 +2885,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "איבר ריק ביחס."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -2994,5 +2898,5 @@
 msgstr "מחק איבר \"{0}\" ביחס."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3000,57 +2904,57 @@
 msgstr "הדרך \"{0}\" בת פחות משתי נקודות."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr "יותר מ-\"to\" אחד נמצא."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr "יותר מ-\"via\" אחד נמצא."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr "אף דרך \"from\" לא נמצאה."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr "אף דרך \"to\" לא נמצאה."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr "לא נמצאה אף נקודה או דרך מסוג \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3102,5 +3006,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3134,4 +3038,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3166,13 +3074,25 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "לא ניתן לקרוא את הסימניות."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "לא ניתן לכתוב סימניות."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3205,4 +3125,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3234,14 +3155,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "שגיאה בלתי צפויה"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
-msgstr "לא יכול להתחבר לשרת osm. בדוק את חיבור האינטרנט."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3468,6 +3388,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3496,39 +3416,39 @@
 msgstr "שמע"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "הזז ימינה"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "מפה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "הזז שמאלה"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "הזז מעלה"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "הזז מטה"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "מיקוד צפיה"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "ריחוק צפיה"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "הגדלה"
@@ -3562,10 +3482,10 @@
 msgstr "(אין עצם)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "השכבה אינה ברשימה."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3647,12 +3567,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr "תכונות"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3661,6 +3581,6 @@
 msgstr "תוויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3668,47 +3588,47 @@
 msgstr "נקודות"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "חברים"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#, java-format
+msgid "{0} pending tag conflicts to be resolved"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
-#, java-format
-msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
 msgid "Nodes(resolved)"
 msgstr "נקודות (פתורות)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "נקודות (עם התנגשויות)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "חברים (פתורים)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3716,25 +3636,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "חברים (עם התנגשויות)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "תכונות (עם התנגשויות)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "פתרון התנגשות"
@@ -3942,8 +3862,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4162,5 +4082,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4173,5 +4093,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4206,6 +4126,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4218,6 +4138,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4288,7 +4208,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4351,7 +4271,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "המשך בכל זאת"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4378,7 +4297,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "פתור התנגשות גירסאות ב-{0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4427,99 +4346,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "שכבות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "פתח רשימה המכילה את כל השכבות שנטענו."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "מחק את השכבה הנבחרת."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "ישנם שינויים לא שמורים. מחק את השכבה בכל זאת?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "מחק שכבה"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "האם אתה באמת רוצה למחוק את כל השכבה?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "מידע"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "כן"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "צפון"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "מחק"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "מחק {0}{1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "הצג/הסתר"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "מחליף את המצב החזותי של השכבה הנבחרת."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "פרטי"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "מחק את השכבה הנבחרת."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "מזג את השכבה מתחת לתוך השכבה הבחורה."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "העבר את השכבה הנבחרת שורה אחת מעלה."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "העבר את השכבה הנוכחית שורה אחת מטה."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "עוד מידע על הכלי הזה"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4528,22 +4440,22 @@
 msgstr[1] "זה ישנה עד {0} עצמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "ערך ריק מוחק את המפתח."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<שונה>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "לשנות ערכים?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4551,5 +4463,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4558,49 +4470,40 @@
 msgstr[1] "שנה תכונות של עד {0} עצמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "נא בחר מפתח"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "נא בחר ערך"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Please select the objects you want to change properties for."
 msgstr "בחר את העצמים שאתה רוצה לשנות את תכונותיהם."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "תכונות\\חברויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "תכונות לעצמים שנבחרו."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "חבר ב"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "שנה יחס"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "באמת מחק את הבחירה מהיחס {0}?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "הוסף תכונות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4617,63 +4520,77 @@
 msgstr "הוסף"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Add a new key/value pair to all objects"
 msgstr "הוסף מצד מפתח/ערך לכל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "ערוך מאפיינים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 msgid "Edit the value of the selected key for all objects"
 msgstr "ערוך את הערך של המפתח הנבחר עבור כל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "תכונות: {0} \\ חברויות: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "תכונות \\ חברויות"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "שנה יחס"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "באמת מחק את הבחירה מהיחס {0}?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "מחק את המפתח הנבחר בכל הפריטים"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "מחק מאפיינים"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "מחק את המפתח הנבחר בכל הפריטים"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "תכונות: {0} \\ חברויות: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "תכונות \\ חברויות"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "יחסים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "פתח רשימה של כל היחסים."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "יחסים: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "פתח עורך עבור היחס הנבחר"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "מחק את היחס הנבחר"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "צור יחס חדש"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4704,5 +4621,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4770,5 +4687,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -4779,21 +4696,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "הורדת איזור"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "מחק את היחס הנבחר"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "הורד משטחים גלויים"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr ""
@@ -4812,17 +4726,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "יחסים"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "מוריד נתונים"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -4840,7 +4753,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "יחסים"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -4851,9 +4763,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -4862,15 +4774,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "בצע שוב את הפעולה האחרונה שבוטלה."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -4880,9 +4791,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -4892,15 +4803,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -4908,5 +4819,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -4914,65 +4825,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
+#, fuzzy
+msgid "Select primitives for selected relation members"
+msgstr "מחק את היחס הנבחר"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "הזז את החברים הנבחרים מעלה"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "הזז מטה את החברים שנבחרו"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "הסר את כל העצמים הנבחרים מהיחס"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "מחק את היחס הנבחר"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr "המשך לפתור"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -4981,10 +4907,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "יחס מתנגש"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -4993,21 +4918,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "שמור את הנתונים הנוכחיים."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5017,37 +4941,37 @@
 msgstr "אישור"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "הורד את כל הדרכים והנקודות הבלתי שלמות ביחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "הורד חברים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5057,31 +4981,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
-msgstr "אשר פעולת שלט רחוק"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "התרחק"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "הזז מטה את החברים שנבחרו"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5142,7 +5059,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "טען בחירה"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -5176,7 +5092,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "שנה מיקום"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6307,5 +6222,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "תמונות בעלות גאותגיות"
@@ -6331,5 +6246,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6348,5 +6263,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "תמונות JPEG (*.jpg)"
@@ -6384,43 +6299,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "נקודת gps"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "התאם ציור קו"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "השתמש בהגדרות הגלובליות."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "צייר קווים בין נקודות בשכבה זו."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "אל תצייר קווים בין נקודות בשכבה זו."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "בחר אפשרויות ציור קו"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "התאם צבעים"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6428,6 +6343,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6501,10 +6416,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "המר לשכבת נתונים"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6515,11 +6430,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6528,29 +6443,29 @@
 msgstr "המר מ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "הורד הכל עם:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} מטרים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "שטח מירבי לבקשה"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} קמ\"ר"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6561,9 +6476,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6571,5 +6486,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6621,5 +6536,5 @@
 msgstr "המר לשכבת GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6644,5 +6559,5 @@
 msgstr[1] "מסלולים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6650,5 +6565,5 @@
 msgstr[1] "נקודות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6657,5 +6572,5 @@
 msgstr[1] "מסלול בעל {0} נקודות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6664,5 +6579,5 @@
 msgstr[1] "{0} מורכב מ-{1} מסלולים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6671,9 +6586,9 @@
 msgstr[1] "{0} נקודות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "סמן gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6681,5 +6596,5 @@
 msgstr[1] "סמנים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6688,14 +6603,14 @@
 msgstr[1] "{0} מורכב מ-{1} סמנים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "סנכרן שמע"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 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:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6703,14 +6618,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6718,13 +6633,13 @@
 msgstr "אתה צריך לעצור את השמע בנקודה על המסלול שבה אתה רוצה את הסמן."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "הצג\\הסתר טקסט\\סמלים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
@@ -7717,7 +7632,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -7789,4 +7704,9 @@
 msgstr "מכין נתונים..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "לא ניתן לקרוא את \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -7798,7 +7718,67 @@
 msgstr "לא ניתן לקרוא את \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr "הערה: GPL אינו תואם לרשיון של OSM. אל תעלה מסלולים שרשיונם GPL."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "קבצי GPX"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "תיאור מסלול GPS"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "הוסף מידע על היוצר"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "שם אמיתי"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "זכויות יוצרים (כתובת)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "מוגדר מראש"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "שנת זכויות היוצרים"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "מילות מפתח"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "אפשרויות ייצוא"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "ייצא ושמור"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"שגיאה בזמן ייצוא {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "בחר רשיון המוגדר מראש"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -7826,4 +7806,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "שגיאת ניתוח. למסמך gpx מבנה לא תקין."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "סוג לא ידוע: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -7956,7 +7941,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "קורא ספרייה {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -7971,4 +7956,5 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8000,4 +7986,32 @@
 msgstr "התחברות"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "קבצי שרת OSM"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8055,30 +8069,26 @@
 msgstr "שגיאה בזמן הניתוח."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "קבצי שרת OSM"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "גרסה לא ידוע"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr "נמצא <nd> שלא בתוך דרך."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "ל <nd> אין התייחסות (ref)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr ""
@@ -8128,5 +8138,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8135,9 +8145,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "סוג לא ידוע: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "מכין נתוני OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr ""
@@ -8260,7 +8275,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
-msgstr "אזהרה - התבקשה טעינת התוסף {0}. התוסף כבר לא נדרש."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8347,7 +8362,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "מידע על התוסף לא נמצא."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8732,23 +8746,23 @@
 msgstr "נמצא קובץ null בתיקייה {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "שגיאה בזמן קבלת קבצים מהסיפריה {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "פותח תמונות ב-AgPifoJ..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -8991,5 +9005,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "שגיאה בטעינת קובץ"
@@ -9036,28 +9050,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the JOSM projection to Lambert and restart"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9066,9 +9065,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
@@ -9228,12 +9227,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
 msgstr ""
 
@@ -9301,5 +9307,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr "התאם WMS"
@@ -10012,22 +10018,27 @@
 msgstr "לא יכול להשיג תמונה"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr "מתחבר"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr "מחובר"
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr "לא מחובר"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr "ההתחברות נכשלה"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "שם"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10060,32 +10071,32 @@
 msgstr "שכבת LiveGPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center Once"
 msgstr "מרכז פעם אחת"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center the LiveGPS layer to current position."
 msgstr "מרכז את שכבת LiveGPS למיקום הנוכחי"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr "מירכוז אוטומטי"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "מרכז את שכבת LiveGPS למיקום הנוכחי באופן רצוף"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr ""
@@ -10324,24 +10335,24 @@
 msgstr "פעולות מורשות"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr "שלט רחוק ביקש להוריד נתונים מה-API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr "בקש פרטים: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr "האם אתה רוצה לאשר את זה?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr "אשר פעולת שלט רחוק"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "שלט רחוק מבקש לייבא נתונים מה-URL הבא:"
@@ -10580,10 +10591,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
+#, fuzzy, java-format
+msgid "{0} start"
 msgstr "התחלה"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr "סוף"
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "נקודה {0}"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11108,10 +11121,10 @@
 msgstr "דרכים חוצות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr "נקודות כפולות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "מבחן זה בודק אם אין נקודות שנמצאות בדיוק באותו מקום."
@@ -11772,9 +11785,32 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "נא בחר את השורה לעריכה."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "מחק שכבה"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+msgid "Start adjusting"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "אין שינויים להעלאה."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11787,57 +11823,57 @@
 msgstr "הורדה אוטומטית"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "הורד משטחים גלויים"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "שנה רזולוציה"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "טען מחדש משטחים פגומים"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "שמור שכבת WMS לקובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "טען שכבת WMS מקובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "גירסת קובץ WMS לא נתמכת; נמצא {0}, צפי {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "שגיאה בפורמט קובץ"
@@ -12421,5 +12457,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -14976,5 +15012,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15276,5 +15312,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15377,5 +15413,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -20001,7 +20037,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "סירת מנוע"
+msgstr ""
 
 #. color tertiary
@@ -23180,5 +23215,5 @@
 msgstr "כפר\\עיר"
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23189,5 +23224,5 @@
 msgstr "חד סטרי"
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23197,5 +23232,5 @@
 msgstr "כנסייה"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23206,5 +23241,5 @@
 msgstr "תחנת דלק"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23215,5 +23250,5 @@
 msgstr "קניות"
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23223,5 +23258,5 @@
 msgstr "שירותים"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23454,15 +23489,50 @@
 msgstr ""
 
-#~ msgid "Update failed"
-#~ msgstr "עדכון נכשל"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "החל פתרון חלקי"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "שכבות: {0}"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "הסר את החבר בשורת הטבלה הבחורה מהיחס"
+#~ msgid "Unknown file extension."
+#~ msgstr "סיומת הקובץ אינה ידועה."
+
+#~ msgid "Move"
+#~ msgstr "הזז"
+
+#~ msgid "end"
+#~ msgstr "סוף"
+
+#~ msgid "Data Layer"
+#~ msgstr "שכבת נתונים"
+
+#~ msgid "Not implemented yet."
+#~ msgstr "עדיין לא הוטמע."
+
+#~ msgid "Email"
+#~ msgstr "דוא\"ל"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "פתור התנגשויות"
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "ארעו התנגשויות במהלך הייבוא."
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "יוצר קשר עם שרת ה-OSM..."
+
+#~ 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 "Object"
+#~ msgstr "פריט"
+
+#~ msgid "unnamed"
+#~ msgstr "ללא שם"
 
 #~ msgid ""
@@ -23470,45 +23540,4 @@
 #~ "about the problem."
 #~ msgstr "לא ניתן להסיר את התוסף. אנא ספר למי שסיפק לך את JOSM על הבעיה."
-
-#~ msgid "Validate"
-#~ msgstr "בדוק תקינות"
-
-#~ msgid "Data Layer"
-#~ msgstr "שכבת נתונים"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "עדיין לא הוטמע."
-
-#~ msgid "Email"
-#~ msgstr "דוא\"ל"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "פתור התנגשויות"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "ארעו התנגשויות במהלך הייבוא."
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "יוצר קשר עם שרת ה-OSM..."
-
-#~ 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 "Object"
-#~ msgstr "פריט"
-
-#~ msgid "unnamed"
-#~ msgstr "ללא שם"
 
 #~ msgid ""
@@ -23547,4 +23576,7 @@
 #~ msgid "Date"
 #~ msgstr "תאריך"
+
+#~ msgid "Layers: {0}"
+#~ msgstr "שכבות: {0}"
 
 #~ msgid "OSM username (email)"
@@ -23618,4 +23650,7 @@
 #~ msgstr "ייבא קובץ TCX כמסלולי GPS"
 
+#~ msgid "Validate"
+#~ msgstr "בדוק תקינות"
+
 #~ msgid "image not loaded"
 #~ msgstr "תמונה לא נטענה"
@@ -23648,4 +23683,7 @@
 #~ msgid "Basic"
 #~ msgstr "בסיסי"
+
+#~ msgid "Remove the member in the current table row from this relation"
+#~ msgstr "הסר את החבר בשורת הטבלה הבחורה מהיחס"
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -23684,4 +23722,7 @@
 #~ msgstr "שמור את שלי"
 
+#~ msgid "Update failed"
+#~ msgstr "עדכון נכשל"
+
 #~ msgid "Delete mine"
 #~ msgstr "מחק את שלי"
@@ -23696,4 +23737,7 @@
 #~ "נא לבחור לפחות נקודה, דרך או יחס אחד. רק לאלמנטים שכבר הועלו יש היסטוריה."
 
+#~ msgid "Apply partial resolutions"
+#~ msgstr "החל פתרון חלקי"
+
 #~ msgid "Move Up"
 #~ msgstr "העלה"
Index: /applications/editors/josm/i18n/po/is.po
===================================================================
--- /applications/editors/josm/i18n/po/is.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/is.po	(revision 16973)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-07-29 17:07+0000\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-06 21:57+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
 "Language-Team: Icelandic <is@li.org>\n"
@@ -16,13 +16,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:35+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -47,15 +40,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -80,7 +65,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -88,4 +73,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -107,8 +96,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Villa"
@@ -119,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Óvistaðar breytingar"
@@ -137,16 +128,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -158,13 +148,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -181,4 +172,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "Hætta við"
@@ -192,5 +184,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -199,5 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -208,23 +201,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -245,5 +238,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Aðvörun"
@@ -260,5 +253,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
 msgid "UNKNOWN"
-msgstr ""
+msgstr "ÓÞEKKT"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
@@ -277,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -308,5 +301,5 @@
 msgstr "Villutilkynningar"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -367,19 +360,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Veldu hlut til að eyða fyrst."
+msgstr "Veldu lag til að sameina þessu lagi."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Eyða laginu"
+msgstr "Veldu lag til að sameina"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "Sameina hnúta"
+msgstr "Sameina"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -418,5 +408,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -449,18 +439,18 @@
 msgstr "Lengdargráða"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Raða hnútum í hring"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Raða völdum hnútum í hring."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -489,18 +479,18 @@
 msgstr "Tól: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Veldu minnst fjóra hnúta"
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -513,5 +503,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -634,13 +624,13 @@
 msgstr "Sameina marga vegi í einn."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Vinsamlegast veldu a.m.k. tvo vegi til að sameina."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "Sameina vegi sem eru stak í mismunandi venslum?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -650,13 +640,13 @@
 "það?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "Sameina þá"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Skipta um átt?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -666,9 +656,9 @@
 "haldist sér. Vilt þú skipta um átt sumra þeirra?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Skipta um átt og sameina"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -677,5 +667,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -683,14 +673,14 @@
 msgstr "Leysa árekstra"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Sameina {0} vegi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -709,23 +699,23 @@
 msgstr "Afrita valda hluti á klemmuborðið."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Veldu eithvað til að afrita"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Búa til hring"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Búa til hring úr þrem völdum hnútum."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -737,8 +727,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -758,15 +748,15 @@
 msgstr "Eyða völdum hlutum."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Yfirskrifa"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "Þessi skrá er þegar til. Yfirskrifa hana?"
@@ -827,5 +817,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -835,7 +825,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "Vensl rekast á"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -846,5 +835,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Tvöfalda"
@@ -868,88 +858,36 @@
 msgstr "Hætta í forritinu."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Vista sem GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Vista gögnin í GPX sniði."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Ekkert til að vista. Opnaðu gögn fyrst."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "lýsing á gps ferli"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Bæta við höfundaupplýsingum"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Nafn"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "Vista gögnin í GPX sniði."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -965,6 +903,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1035,5 +973,5 @@
 msgstr "Tengir endahnút á vegi við nálægan veg"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr ""
@@ -1044,12 +982,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Endurnefna lag"
+msgstr "Sameina lag"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "Sameina valið lag laginu sem er fyrir neðan það í valllistanum."
+msgstr "Sameina það lag sem nú er valið öðru lagi"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1064,9 +1000,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
 msgid "Please select at least two nodes to merge."
-msgstr ""
+msgstr "Veldu minnst tvo hnúta til að sameina."
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
 msgid "Merge nodes with different memberships?"
-msgstr ""
+msgstr "Sameina hnúta sem eru stak í mismunandi venslum?"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
@@ -1093,12 +1029,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "vali"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Uppfærir þá hluti sem eru valdir frá þjóninum"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1158,5 +1092,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "Ný"
@@ -1247,5 +1181,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Líma"
@@ -1257,5 +1191,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Líma eigindi"
@@ -1302,7 +1236,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Gat ekki endurnefnt skránna „{0}“."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1339,5 +1273,9 @@
 msgstr "Skráin {0} er þegar til. Yfirskrifa hana?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+msgid "No Exporter found! Nothing saved."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1345,25 +1283,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Tómt skjal"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Árekstrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1371,56 +1309,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "Vista OSM skrá"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "Vista GPX skrá"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Óþekkt skráarending: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Óþekkt skráarending"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "Villa kom upp: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
 msgstr ""
 
@@ -1528,5 +1428,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1534,5 +1434,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1540,5 +1440,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1784,7 +1684,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "Upphala öllum breytingum á OSM þjóninn."
+msgstr "senda allar breytingarnar í einu á þjónin"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1939,10 +1838,9 @@
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
-msgstr ""
+msgstr "Niðurhal {0} af {1} ({2} eftir)"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "Hleð upp gögnum"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
@@ -1987,5 +1885,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -1993,6 +1891,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2003,8 +1901,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2049,38 +1947,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "Get ekki bætt við hnút handan endamarka veraldar."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Bæta við hnút"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Bæta hnút við veg"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2089,14 +1987,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr ""
@@ -2116,5 +2014,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2125,5 +2023,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr ""
@@ -2158,9 +2056,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2170,18 +2068,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2404,26 +2302,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2432,5 +2330,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2520,8 +2418,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Leysa árekstra"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2538,5 +2435,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2580,5 +2477,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "Fjarlægja úr venslum"
@@ -2591,5 +2488,5 @@
 msgstr "Valið „{0}“ er notað af venslunum „{1}“."
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr ""
@@ -2597,5 +2494,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2607,8 +2505,7 @@
 "verið að nota þá.<br>Ertu viss um að þú viljir eyða þeim?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "Fjarlægja úr venslum"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2618,9 +2515,221 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "{0} hnútur"
+msgstr[1] "{0} hnútar"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "{0} hnútur"
+msgstr[1] "{0} hnútar"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Vensl"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Ekki vista breytingar"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "V"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "A"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "Breyta {0} hlut"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "óklárað"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2634,208 +2743,4 @@
 msgstr[1] "hnútar"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "Vensl"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "Ekki vista breytingar"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "V"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "A"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "óklárað"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2867,5 +2772,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2898,5 +2803,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -2905,22 +2810,22 @@
 msgstr[1] "{0} stök"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "vatnsfarvegur"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -2985,10 +2890,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -2996,5 +2903,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3002,57 +2909,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Óþekkt hlutverk \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3104,5 +3011,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3136,4 +3043,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3168,13 +3079,25 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "Gat ekki lesið bókamerki."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "Gat ekki skrifað bókamerki."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3207,4 +3130,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3236,15 +3160,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "Óvænt villa"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
 msgstr ""
-"Gat ekki tengst OSM þjóninum. Vinsamlegast athugaðu nettenginguna þína."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3261,7 +3183,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
-#, fuzzy
 msgid "Unknown host"
-msgstr "Óþekkt útgáfa"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
@@ -3466,6 +3387,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3494,39 +3415,39 @@
 msgstr "Hljóð"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Kort: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Færa upp"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Færa niður"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "Þysja inn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Þysja út"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "skali"
@@ -3560,10 +3481,10 @@
 msgstr "(enginn hlutur)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3645,12 +3566,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3659,6 +3580,6 @@
 msgstr "Tögg"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3666,47 +3587,47 @@
 msgstr "Hnútar"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Stök"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#, java-format
+msgid "{0} pending tag conflicts to be resolved"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
-#, java-format
-msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3714,25 +3635,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
@@ -3932,8 +3853,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4152,5 +4073,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4163,5 +4084,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4196,6 +4117,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4208,6 +4129,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4278,7 +4199,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4341,7 +4262,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Sameina þá"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4368,7 +4288,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Leysa breytingarárekstra"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4417,99 +4337,92 @@
 msgstr "Sýna breytingasögu valdra hluta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Lög"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Sýna lista yfir öll lög."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Eyða völdu lagi."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "Það eru óvistaðar breytingar. Eyða laginu þrátt fyrir það?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "Eyða laginu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "Ert þú viss um að þú viljir eyða öllu laginu?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr "Ert þú viss um að þú viljir eyða laginu „{0}“?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Upplýsingar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "já"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr "Já"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Fjarlægja"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+msgstr "Eyða öllum lögunum"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
 #, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr "Eyði lagi {0} af {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Sýna/Fela"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Sýna eða fela valið lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "einkavegur"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "Eyða völdu lagi."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr "Virkja valið lag"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "Sameina valið lag laginu sem er fyrir neðan það í valllistanum."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr "Sameina þetta lag öðru lagi"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Færa valið lag upp í röðinni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Færa valið lag niður í röðinni"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "Fræðsluskilti"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr "Upplýsingar um lag"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4518,22 +4431,22 @@
 msgstr[1] "Allt að {0} hlutum verður breytt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "Tómt gildi eyðir lyklinum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<mismunandi>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Breyta eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4541,5 +4454,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4548,49 +4461,40 @@
 msgstr[1] "Breyta eigindum allt að {0} hluta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Veldu lykil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Veldu gildi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 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/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "Eigindi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Eigindi valdra hluta."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "Stak í"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "Breyta venslum"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "Eyða valinu úr venslunum {0}?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "Bæti vað eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4607,63 +4511,77 @@
 msgstr "Bæta við"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 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/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "Breyta eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 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/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "Breyta venslum"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "Eyða valinu úr venslunum {0}?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "Eyða völdum lykil í öllum völdum hlutumaccess"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "Eyða eigindum"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "Eyða völdum lykil í öllum völdum hlutumaccess"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr ""
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "Sýna lista yfir vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Opna ritil til að breyta völdum venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Eyða völdum venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Skapa ný vensl"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4694,5 +4612,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4762,5 +4680,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -4771,21 +4689,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "Niðurhalssvæði"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "Eyða völdum venslum"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Niðurhala sýnilega reiti"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr ""
@@ -4804,17 +4719,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "Vensl"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "Sæki gögn"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -4832,7 +4746,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "Vensl"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -4843,9 +4756,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr "Hlutverk:"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -4854,15 +4767,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "Endurtaka afturkallaða aðgerð."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -4872,9 +4784,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -4884,15 +4796,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -4900,5 +4812,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -4906,65 +4818,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
+msgid "Remove all members referring to one of the selected primitives"
+msgstr ""
+
+#. putValue(NAME, tr("Remove Selected"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Relation Editor: Remove Selected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #, fuzzy
-msgid "Remove all members referring to one of the selected primitives"
-msgstr "Sýna breytingasögu valdra hluta"
-
-#. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
-msgid "Relation Editor: Remove Selected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Select primitives for selected relation members"
+msgstr "Eyða völdum venslum"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "Færa valda meðlimi upp"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "Færa valda meðlimi niður"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Fjarlægja valda meðlimi úr venslunum"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "Eyða völdum venslum"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -4973,10 +4900,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "Vensl rekast á"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -4985,21 +4911,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Vista þau gögn sem sjást núna."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr "Vista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5009,37 +4934,37 @@
 msgstr "Í lagi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr "Bæta við tómu taggi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr "Eyða völdum töggum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Hala niður öllum nóðum og vegum í þessum venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "Niðurhala meðlimum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr "Vistar hlutverk fyrir völd stök"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr "Vista hlutverk"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5049,30 +4974,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Þysja út"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "Færa valda meðlimi niður"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5133,7 +5052,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "vensl"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -5167,7 +5085,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "bæta við val"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6301,5 +6218,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr ""
@@ -6325,5 +6242,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6342,5 +6259,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG myndir (*.jpg)"
@@ -6378,43 +6295,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Sérsníða teikningu lína"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Sérsníða liti"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6422,6 +6339,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6495,10 +6412,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Breyta í gagnalag"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6507,11 +6424,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6520,29 +6437,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6551,9 +6468,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6561,5 +6478,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6609,5 +6526,5 @@
 msgstr "Breyta í GPX-lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6632,5 +6549,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6638,5 +6555,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6645,5 +6562,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6652,5 +6569,5 @@
 msgstr[1] "{0} samanstendur af {1} ferlum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6659,9 +6576,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "gps punktur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6669,5 +6586,5 @@
 msgstr[1] "punktar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6676,14 +6593,14 @@
 msgstr[1] "{0} samanstendur af {1} punktum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 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:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6691,14 +6608,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6706,13 +6623,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Sýna/Fela texta og táknmyndir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
@@ -7319,7 +7236,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
-#, fuzzy
 msgid "JOSM Plugin description URL"
-msgstr "Bæta við viðbótarþjóni."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
@@ -7712,7 +7628,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -7784,4 +7700,9 @@
 msgstr "Undirbý gögn..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "Gat ekki lesið frá veffang: \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -7793,6 +7714,64 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "lýsing á gps ferli"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Bæta við höfundaupplýsingum"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Nafn"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
 msgstr ""
 
@@ -7821,4 +7800,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Óþekkt hlutverk \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -7966,4 +7950,5 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -7995,4 +7980,32 @@
 msgstr "Innskrá"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8050,30 +8063,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Óþekkt útgáfa"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr "Óþekkt útgáfa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr ""
@@ -8123,5 +8132,5 @@
 msgstr "Atriði merkt \"{0}\" vantar"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8130,9 +8139,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "Óþekkt útgáfa: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "Undirbý OSM gögn..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "Illa-formað kenni á hnút"
@@ -8235,5 +8249,5 @@
 #, java-format
 msgid "Downloading Plugin {0}..."
-msgstr ""
+msgstr "Niðurhel {0}..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
@@ -8345,7 +8359,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "Upplýsingar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8732,23 +8745,23 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "Opna myndir með AgPifoJ..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -8987,5 +9000,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr ""
@@ -9032,28 +9045,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the JOSM projection to Lambert and restart"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9062,9 +9060,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
@@ -9224,12 +9222,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
 msgstr ""
 
@@ -9297,5 +9302,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr ""
@@ -9733,10 +9738,10 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51
 msgid "Lake Walker."
-msgstr ""
+msgstr "Rekja vatn."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17
 msgid "Lake Walker"
-msgstr ""
+msgstr "Rekja vatn"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118
@@ -10005,22 +10010,27 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr ""
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "nafn"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10053,32 +10063,32 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+msgid "Capture GPS Track"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+msgid "Center Once"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+msgid "Center the LiveGPS layer to current position."
+msgstr ""
+
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
-msgid "Capture GPS Track"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
-msgid "Center Once"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
-msgid "Center the LiveGPS layer to current position."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
 msgid "Auto-Center"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr ""
@@ -10314,24 +10324,24 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -10570,10 +10580,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
-msgstr ""
+#, fuzzy, java-format
+msgid "{0} start"
+msgstr "{0} vegur"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr ""
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} hnútur"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11096,10 +11108,10 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
@@ -11758,9 +11770,32 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr "Leiðrétta stöðu WMS lagsins sem nú er valið"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "Veldu hlut til að breyta fyrst."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "Veldu lag til að sameina"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+msgid "Start adjusting"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "Engar  breytingar til að hlaða upp."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11773,57 +11808,57 @@
 msgstr "Sjálfvirkt niðurhal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Niðurhala sýnilega reiti"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Breyta upplausn"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Hlaða reiti sem innihalda villur"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Vista WMS lag í skrá"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "Hlaða WMS lag úr skrá"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr ""
@@ -12405,5 +12440,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -14960,5 +14995,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15260,5 +15295,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15361,5 +15396,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -19985,7 +20020,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "Hraðbrautarlíkar aðgangstakmarkanir"
+msgstr ""
 
 #. color tertiary
@@ -23164,5 +23198,5 @@
 msgstr ""
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23173,5 +23207,5 @@
 msgstr ""
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23181,5 +23215,5 @@
 msgstr ""
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23190,5 +23224,5 @@
 msgstr "Eldsneytisstöð"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23199,5 +23233,5 @@
 msgstr ""
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23207,5 +23241,5 @@
 msgstr ""
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23438,20 +23472,6 @@
 msgstr ""
 
-#~ 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 "Layers: {0}"
-#~ msgstr "Lög: {0}"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Fjarlægja val úr venslunum"
-
-#~ msgid "Validate"
-#~ msgstr "Athuga"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Athuga núverandi val eða öll gögn í laginu."
+#~ msgid "Unknown file extension."
+#~ msgstr "Óþekkt skráarending"
 
 #~ msgid "Aborting..."
@@ -23482,4 +23502,7 @@
 #~ "reyna síðar."
 
+#~ msgid "Remove the member in the current table row from this relation"
+#~ msgstr "Fjarlægja val úr venslunum"
+
 #~ msgid "Email"
 #~ msgstr "Netfang"
@@ -23534,7 +23557,16 @@
 #~ msgstr "Afturkalla"
 
+#~ msgid "Validate"
+#~ msgstr "Athuga"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Athuga núverandi val eða öll gögn í laginu."
+
 #~ msgid "Open the OpenStreetBugs window and activate the automatic download"
 #~ msgstr "Opna OpenStreetBugs gluggann og virkja sjálfvirkt niðurhal paddna."
 
+#~ msgid "Layers: {0}"
+#~ msgstr "Lög: {0}"
+
 #~ msgid "Data Layer"
 #~ msgstr "Gagnalag"
@@ -23569,2 +23601,7 @@
 #~ msgid "Basic"
 #~ msgstr "Grunnupplýsingar"
+
+#~ 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."
Index: /applications/editors/josm/i18n/po/it.po
===================================================================
--- /applications/editors/josm/i18n/po/it.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/it.po	(revision 16973)
@@ -5,7 +5,7 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-07-18 17:43+0000\n"
-"Last-Translator: simone <Unknown>\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-05 08:40+0000\n"
+"Last-Translator: Davide Prade <davalv@alice.it>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,13 +13,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:32+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -45,15 +38,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -78,7 +63,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -86,4 +71,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -105,8 +94,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Errore"
@@ -119,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Modifiche non salvate"
@@ -138,16 +129,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -159,13 +149,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -182,4 +173,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "Annulla"
@@ -193,5 +185,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -200,5 +192,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -209,23 +202,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -246,5 +239,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Attenzione"
@@ -278,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -309,5 +302,5 @@
 msgstr "Segnalazione errori"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -333,5 +326,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
 msgid "License"
-msgstr ""
+msgstr "Licenza"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
@@ -373,19 +366,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Scegli la riga da cancellare."
+msgstr "Selezionare il livello di riferimento."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Selezionare uno di questi:"
+msgstr "Seleziona il livello di riferimento."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "Fondi nodi"
+msgstr "Unisci"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -395,8 +385,9 @@
 "</html>"
 msgstr ""
+"<html>Non ci sono livelli al quale unire il livello sorgente ''{0}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 msgid "No target layers"
-msgstr ""
+msgstr "Nessun livello di riferimento"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
@@ -424,5 +415,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -455,18 +446,18 @@
 msgstr "Longitudine"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Disponi i nodi in cerchio"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Sposta i nodi selezionati disponendoli su un cerchio."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -495,18 +486,18 @@
 msgstr "Strumenti: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Selezionare almeno quattro nodi."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -519,5 +510,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -648,13 +639,13 @@
 msgstr "Unisce diversi percorsi in uno."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Selezionare almeno due percorsi da unire."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "Unire i percorsi con diverse appartenenze?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -664,13 +655,13 @@
 "unirli?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "Unisci comunque"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Inverti direzione?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -680,9 +671,9 @@
 "la direzione di qualcuno?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Inverti direzione e unisci"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -691,5 +682,5 @@
 msgstr "Inserire dei valori per tutti i conflitti."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -697,14 +688,14 @@
 msgstr "Risolvi conflitti"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Unisci {0} percorsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "Tutti i percorsi erano vuoti"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -723,24 +714,23 @@
 msgstr "Copia gli oggetti selezionati all'interno del buffer"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Seleziona qualcosa da copiare."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Crea cerchio"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Crea un cerchio a partire da tre nodi selezionati"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "Questi nodi non sono disposti in cerchio"
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr "Questi nodi non sono disposti su una circonferenza. Annullo."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -754,8 +744,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -775,15 +765,15 @@
 msgstr "Cancella gli oggetti selezionati."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Sovrascrivi"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "Il file esiste. Sovrascriverlo?"
@@ -831,18 +821,20 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download referrers from OSM..."
-msgstr ""
+msgstr "Scarica riferimenti da OSM..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
+"Scarica le primitive che hanno come riferimento una delle primitive "
+"selezionate"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42
 msgid "Download referrers..."
-msgstr ""
+msgstr "Scarica riferimenti..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -852,16 +844,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "Errori durante lo scaricamento"
+msgstr "Conflitti durante lo scaricamento"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
 #, java-format
 msgid "({0}/{1}) Loading parents of primitive {2}"
-msgstr ""
+msgstr "({0}/{1}) Caricamento dei genitori della primitiva {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Duplica"
@@ -885,92 +877,36 @@
 msgstr "Esci dall'applicazione."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Nota: la GPL non è compatibile con la licenza di OSM. Non caricare tracce "
-"con licenza GPL."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Esporta in GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Esporta i dati in un file GPX."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Niente da esportare. Prima è necessario ottenere dei dati."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+msgstr "il parametro ''{0}'' non deve essere nullo"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "descrizione della traccia GPS"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Aggiungi informazioni sull'autore"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Nome reale"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Diritto d'autore (URL)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Predefinito"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "Copyright anno"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Parole chiave"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Opzioni di esportazione"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "Esporta e Salva"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Errore nella esportazione di {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Scegliere una licenza predefinita"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "Esporta i dati in un file GPX."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -986,6 +922,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1061,5 +997,5 @@
 msgstr "Unisci un nodo al percorso più vicino"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "Unisci il nodo e il percorso"
@@ -1070,12 +1006,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Incorpora comunque"
+msgstr "Unisci livello"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "Unisci il layer direttamente nel layer selezionato sotto"
+msgstr "Unisci il livello corrente con un altro livello"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1118,12 +1052,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "selezione"
+msgstr "Unisci selezione"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Aggiorna le primitive attualmente selezionate dal server"
+msgstr "Unisci le primitive attualmente selezionate con un altro livello"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1183,5 +1115,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "Nuovo"
@@ -1203,5 +1135,5 @@
 #, java-format
 msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
-msgstr ""
+msgstr "<html>Impossibile leggere il file ''{0}''. L''errore è: <br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
@@ -1258,5 +1190,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
-#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1264,7 +1195,4 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 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?"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1278,5 +1206,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Incolla"
@@ -1288,5 +1216,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Incolla le etichette"
@@ -1333,7 +1261,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Impossibile rinominare il file \"{0}\"."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1370,5 +1298,12 @@
 msgstr "Il file {0} esiste. Sovrascrivere?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr ""
+"Non è stata trovata alcuna intersezione. Non è stata apportata alcuna "
+"modifica."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1378,25 +1313,25 @@
 "questo come bug."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "Nessun documento è aperto per cui non c'è niente da salvare."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Documento vuoto"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "Il documento non contiene dati"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "Salva comunque"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Conflitti"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1406,59 +1341,19 @@
 "gestiti come se si fossero stati tutti rifiutati. Continuare?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "Rifiuta i conflitti e Salva"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "Salva file OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "Salva in un file GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "Salva livello"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Impossibile creare una copia di backup."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Estensione del file sconosciuta: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr ""
-"<html>E'' stato generato un errore durante la comunicazione con il "
-"server<br>Dettagli: {0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr "Errore durante il ripristino di un file di backup."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "L'estensione del file è sconosciuta."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "Si è verificato un errore durante il salvataggio."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr "Errore durante il ripristino di un file di backup."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1573,24 +1468,17 @@
 "seleziona i nodi in mezzo al percorso)."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
 "should verify this and correct it when necessary.</html>"
 msgstr ""
-"L'appartenenza ad una relazione basata su regole è stata copiata a tutti i "
-"nuovi percorsi.\n"
-"Controllare ed eventualmente correggere."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
-#, fuzzy
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
 "this and correct it when necessary.</html>"
 msgstr ""
-"L'appartenenza ad una relazione è stata copiata su tutti i nuovi percorsi.\n"
-"Verificare e correggere dove necessario."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1735,14 +1623,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
-#, fuzzy
 msgid "No current dataset found"
-msgstr "Non è stato trovato alcun livello dei dati GPX."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
-#, fuzzy
 msgid "Didn't find a primitive with id {0} in the current dataset"
 msgstr ""
-"Non è possibile trovare la primitiva con identificativo {0} nell'insieme di "
-"dati locale corrente"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
@@ -1868,7 +1752,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "Carica tutti i cambiamenti sul server OSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -2026,13 +1909,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "Caricamento dei dati"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download:{0}"
 msgstr ""
-"Sono stati generati i seguenti errori durante lo scaricamento di massa:"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -2072,5 +1953,5 @@
 msgstr "Modalità: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2081,6 +1962,6 @@
 "gli oggetti che si riferiscono a questo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2091,8 +1972,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2137,38 +2018,38 @@
 msgstr "selezionato"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "Non si può disegnare un nodo fuori dal mondo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Aggiungi nodo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Aggiungi un nodo al percorso"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "Collega un percorso esistente al nodo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Aggiungi un nodo ad un percorso esistente"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "Aggiungi un nodo al percorso e connetti"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "Crea un nuovo nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "Seleziona il nodo sotto il cursore."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2177,14 +2058,14 @@
 msgstr[1] "Inserisci un nuovo nodo nei {0} percorsi."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "Inizia un nuovo percorso dall'ultimo nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "Continua un percorso dall'ultimo nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "Termina tracciamento."
@@ -2204,5 +2085,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2217,5 +2098,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "Rilascia il bottone del mouse per interrompere la rotazione."
@@ -2255,9 +2136,9 @@
 msgstr[1] "Aggiungi e sposta un nuovo nodo virtuale sui {0} percorsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr "Muovi elementi"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2270,13 +2151,13 @@
 "Si è sicuri di volerli muovere?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr "Muoverli"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr "Annullare lo spostamento"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2285,5 +2166,5 @@
 "più vicino."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2525,26 +2406,26 @@
 "relazione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Token inaspettato: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr "Argomenti mancanti per l'operatore booleano OR."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr "Argomento mancante per l'operatore booleano NOT."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "Era attesa una parentesi chiusa."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Numero errato di parametri per operatore sui nodi."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2555,5 +2436,5 @@
 "richiede un numero o un intervallo di nodi, per esempio nodes:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2643,23 +2524,22 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Risolvi conflitto"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
 "primitmive ''{1}''"
-msgstr "Un conflitto per la primitca \"{0}\" è già stato registrato"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "Nessuna corrispondenza trovata per ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2705,5 +2585,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "Elimina dalla relazione"
@@ -2718,5 +2598,5 @@
 "Cancellare dalla relazione?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr "Dividi il segmento del percorso"
@@ -2724,5 +2604,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2734,8 +2615,7 @@
 "(che non puoi vedere).<br>Vuoi veramente cancellarli?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "Elimina dalla relazione"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2745,9 +2625,226 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Sposta"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "Unisci {0} nodi"
+msgstr[1] "Unisci {0} nodi"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr "Eliminazione di 1 primitiva"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr "rimozione del riferimento dal percorso {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr "rimozione del riferimento dalla relazione {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr "Risolvi conflitti nella lista dei membri della relazione {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr "Rimuovere il membro della relazione {0} {1}"
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "Ruota {0} {1}"
+msgstr[1] "Ruota {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Sequenza"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "Risolvi {0} conflitti sulle etichette in {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr "Ripristina {0} primitive"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr "Risolvi i conflitti di versione per {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr "Risolvi i conflitti nella lista di nodi del percorso {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr "Il set di dati principale non include il node {0}"
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Applicare?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"Invertendo la direzione di questo percorso si consiglia di apportare i "
+"seguenti cambiamenti alle proprietà del percorso in modo da mantenere la "
+"consistenza dei dati."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Relazione"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Vecchia regola"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "Nuova regola"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Chiave precedente"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Valore precedente"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Nuova chiave"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "Nuovo valore"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Applica i cambiamenti selezionati"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Non applicare cambiamenti"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "Selezionare quali cambiamenti alle proprietà si vogliono applicare."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Proprietà di "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr "Regole nelle relazioni a cui si riferiscono"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Correzione automatica etichette"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Errore di formato nel file di configurazione alla linea {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Impossibile aprire la cartella delle preferenze: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+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}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Preferenze salvate in {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Impossibile caricare le preferenze. Motivo: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "Impossibile scaricare le preferenze dal server."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr "Un conflitto per la primitca \"{0}\" è già stato registrato"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "Gradi Decimali"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "Gradi Minuti Secondi"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "O"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "E"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "Cambiare {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr "è richiesto il parametro {0} > 0. Ottenuto {1}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "incompleto"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2761,213 +2858,4 @@
 msgstr[1] "nodi"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr "Eliminazione di 1 primitiva"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr "rimozione del riferimento dal percorso {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr "rimozione del riferimento dalla relazione {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr "Risolvi conflitti nella lista dei membri della relazione {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr "Rimuovere il membro della relazione {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr "Ruota {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Sequenza"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "Risolvi {0} conflitti sulle etichette in {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr "Ripristina {0} primitive"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "Risolvi i conflitti di versione per {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr "Risolvi i conflitti nella lista di nodi del percorso {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr "Il set di dati principale non include il node {0}"
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Applicare?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"Invertendo la direzione di questo percorso si consiglia di apportare i "
-"seguenti cambiamenti alle proprietà del percorso in modo da mantenere la "
-"consistenza dei dati."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "Relazione"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "Vecchia regola"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "Nuova regola"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Chiave precedente"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Valore precedente"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Nuova chiave"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "Nuovo valore"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "Applica i cambiamenti selezionati"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "Non applicare cambiamenti"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "Selezionare quali cambiamenti alle proprietà si vogliono applicare."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "Proprietà di "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr "Regole nelle relazioni a cui si riferiscono"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "Correzione automatica etichette"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Errore di formato nel file di configurazione alla linea {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Impossibile aprire la cartella delle preferenze: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-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}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Preferenze salvate in {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Impossibile caricare le preferenze. Motivo: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "Impossibile scaricare le preferenze dal server."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr "Un conflitto per la primitca \"{0}\" è già stato registrato"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "Gradi Decimali"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "Gradi Minuti Secondi"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "O"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "E"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "è richiesto il parametro {0} > 0. Ottenuto {1}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "incompleto"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2999,5 +2887,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -3030,5 +2918,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -3037,22 +2925,22 @@
 msgstr[1] "{0} membri"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "strada"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "ferrovia"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "corso d'acqua"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "tipologia di area"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -3117,10 +3005,12 @@
 msgstr "il percorso multi-poligonale ''{0}'' non è chiuso."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "Membro vuoto nella relazione."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3128,5 +3018,5 @@
 msgstr "Eliminato il membro ''{0}'' nella relazione."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3134,57 +3024,57 @@
 msgstr "Percorso ''{0}'' con meno di due punti."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr "E' stato trovato più di un percorso \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr "E' stato trovato più di un percorso \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr "E' stata trovata più di una \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Ruolo ''{0}'' sconosciuto."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo di membro sconosciuto per ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr "Non è stato trovato un percorso \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr "Non è stato trovato un percorso \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr "Non è stato trovato alcun nodo o percorso \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 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\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 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\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Il percorso \"from\" non inizia o finisce sul percorso \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Il percorso \"to\" non inizia o finisce sul percorso \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3236,5 +3126,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3268,4 +3158,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3305,13 +3199,25 @@
 msgstr "Zona UTM {0}"
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "Impossibile leggere i segnalibri."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "Impossibile scrivere i segnalibri."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3350,4 +3256,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3379,16 +3286,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "Eccezione inattesa"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
 msgstr ""
-"Impossibile connettersi al server osm. Controllare la propria connessione ad "
-"internet."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3397,5 +3301,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -3403,8 +3307,4 @@
 "preferences and your internet connection.</html>"
 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."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
@@ -3627,6 +3527,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3655,39 +3555,39 @@
 msgstr "Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "Sposta a destra"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Mappa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "Sposta a sinistra"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Sposta in alto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Sposta in basso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "Ingrandisci"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Riduci"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "scala"
@@ -3721,10 +3621,10 @@
 msgstr "(nessun oggetto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "livello non in lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3807,12 +3707,12 @@
 msgstr "il ruolo {0} non partecipa nella comparazione {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3821,6 +3721,6 @@
 msgstr "Etichette"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3828,30 +3728,30 @@
 msgstr "Nodi"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "Non c'è alcun conflitto di etichette in attesa di risoluzione"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Etichette({0} conflitti)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} conflitti di etichette in attesa di risoluzione"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Nodi(risolti)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
@@ -3860,17 +3760,17 @@
 "alcun conflitto in attesa"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Nodi(con conflitti)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "Conflitti in attesa nella lista di nodi di questo percorso"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Membri(risolti)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3880,25 +3780,25 @@
 "non c'è alcun conflitto in attesa"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Membri(con conflitti)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Conflitti in attesa nella lista di membri di questa relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr "Non c'è alcun conflitto di proprietà in attesa"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Proprietà(con conflitti)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr "Conflitti di proprietà in attesa di essere risolti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Risoluzione conflitto"
@@ -4120,8 +4020,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4354,5 +4254,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4365,5 +4265,5 @@
 msgstr "Primitiva"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4402,6 +4302,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4414,6 +4314,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4487,7 +4387,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4552,7 +4452,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Continua comunque"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4561,5 +4460,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>You didn''t finish to merge the differences in this conflict."
@@ -4569,8 +4468,4 @@
 "<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210
@@ -4583,7 +4478,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Risolvi i conflitti di versione per {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4634,99 +4529,92 @@
 msgstr "Visualizza lo storico della primitiva selezionata"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Livelli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Apre la lista di tutti i livello caricati."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Cancella il livello selezionato."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "Ci sono modifiche non salvate. Cancellare comunque il layer?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "Elimina livello"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "Vuoi veramente cancellare tutto il livello?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Informazioni"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "si"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Cancella"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "Cancella {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Mostra/Nascondi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Inverte la visibilità del livello selezionato."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "privato"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "Cancella il livello selezionato."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "Unisci il layer direttamente nel layer selezionato sotto"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Sposta il livello selezionato in su."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Sposta il layer selezionato in giù."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "Tabellone informativo"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4735,22 +4623,22 @@
 msgstr[1] "Questo cambierà {0} oggetti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "Un valore vuoto cancella la chiave."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<diverso>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Cambiare i valori?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4758,5 +4646,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4765,49 +4653,40 @@
 msgstr[1] "Cambia le proprietà di al massimo {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Seleziona una chiave"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Seleziona un valore"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 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/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "Proprietà/Appartenenze"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Proprietà per gli oggetti selezionati."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "Membro di"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "Cambia relazione"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "Vuoi veramente cancellare la selezione dalla relazione {0}?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "Aggiungi proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4824,63 +4703,77 @@
 msgstr "Aggiungi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Add a new key/value pair to all objects"
 msgstr "Aggiungi una nuova coppia chiave/valore a tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "Modifica proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 msgid "Edit the value of the selected key for all objects"
 msgstr "Modifica il valore della chiave selezionata per tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Proprietà: {0} / Appartenenze: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "Proprietà / Appartenenze"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "Cambia relazione"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "Vuoi veramente cancellare la selezione dalla relazione {0}?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "Cancella la chiave selezionata in tutti gli oggetti"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "Elimina proprietà"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "Cancella la chiave selezionata in tutti gli oggetti"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Proprietà: {0} / Appartenenze: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "Proprietà / Appartenenze"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Relazioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "Apri tutte le relazioni in una lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relazioni: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Apri le relazioni selezionate in un editor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Cancella le relazioni selezionate"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Crea una nuova relazione"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4911,5 +4804,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4981,31 +4874,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
-#, fuzzy
 msgid "Download all child relations (recursively)"
-msgstr "Scarica i membri della relazione"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "Area da scaricare"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "Cancella le relazioni selezionate"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Scarica i tasselli visibili"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr "Scarica i membri della relazione"
@@ -5024,17 +4913,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "Nessuna relazione selezionata"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "Scaricamento estensione {0}..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5052,7 +4940,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "Relazioni"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -5063,9 +4950,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5074,15 +4961,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "Sono stati rimossi elementi dalle Relazioni"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -5092,9 +4978,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -5104,15 +4990,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5120,5 +5006,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5126,66 +5012,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
+msgid "Remove all members referring to one of the selected primitives"
+msgstr ""
+
+#. putValue(NAME, tr("Remove Selected"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Relation Editor: Remove Selected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #, fuzzy
-msgid "Remove all members referring to one of the selected primitives"
-msgstr "E' fallito il tentativo di aggiornare le primitive selezionate."
-
-#. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
-msgid "Relation Editor: Remove Selected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Select primitives for selected relation members"
+msgstr "Cancella le relazioni selezionate"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "Sposta in alto i membri attualmente selezionati"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "Sposta in basso i membri attualmente selezionati"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Rimuovi dalla relazione gli elementi selezionati"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "Cancella le relazioni selezionate"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr "Continua risoluzione"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5194,10 +5094,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "Conflitto nei dati"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -5206,21 +5105,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Salva i dati attuali."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5230,37 +5128,37 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Scarica tutti i percorsi ed i nodi incompleti di questa relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "Scarica i membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5270,32 +5168,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
-msgstr "Si, elimina"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
-msgstr "Conferma l'azione del controllo remoto"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Riduci"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "Sposta in basso i membri attualmente selezionati"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5356,7 +5246,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "Carica selezione"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -5390,7 +5279,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "Cambia posizione"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6528,5 +6416,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Immagini geoetichettate"
@@ -6552,5 +6440,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6569,5 +6457,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "Immagini JPEG (*.jpeg)"
@@ -6605,43 +6493,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "punto GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Personalizza disegno linee"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Usa le impostazioni globali."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Disegna le linee tra i punti di questo livello."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Non disegnare le linee tra i punti di questo livello."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Seleziona le opzioni per il disegno delle linee"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Personalizza colori"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6649,6 +6537,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6722,10 +6610,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Converti in livello dati"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6736,11 +6624,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6749,29 +6637,29 @@
 msgstr "Convertito da: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr "Scarica da OSM lungo questo tracciato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "Scarica tutto entro:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "Area massima per richiesta:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km quadrati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6782,9 +6670,9 @@
 "vuole procedere?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 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:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6795,5 +6683,5 @@
 "all'inizio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6847,5 +6735,5 @@
 msgstr "Converti in un layer GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6870,5 +6758,5 @@
 msgstr[1] "tracce"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6876,5 +6764,5 @@
 msgstr[1] "punti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6883,5 +6771,5 @@
 msgstr[1] "una traccia con {0} punti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6890,5 +6778,5 @@
 msgstr[1] "{0} è composto da {1} tracce"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6897,9 +6785,9 @@
 msgstr[1] "{0} punti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "segnaposto gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6907,5 +6795,5 @@
 msgstr[1] "marcatori"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6914,14 +6802,14 @@
 msgstr[1] "{0} è composto da {1} marcatori"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "Sincronizza l'audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 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:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6929,14 +6817,14 @@
 msgstr "Audio sincronizzato al punto {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 msgid "Unable to synchronize in layer being played."
 msgstr "Impossibile sincronizzare nel layer in esecuzione."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 msgid "Make Audio Marker at Play Head"
 msgstr "Esegui il marcatore audio all'inizio del brano"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6944,13 +6832,13 @@
 msgstr "Premi pausa nel punto del tracciato dove vuoi il marcatore"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 msgid "No existing audio markers in this layer to offset from."
 msgstr "Non ci sono marcatori audio in questo layer da compensare."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Mostra/Nascondi testo/icone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Invertire la visualizzazione dei marcatori di testo ed icone"
@@ -7606,7 +7494,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
-#, fuzzy
 msgid "JOSM Plugin description URL"
-msgstr "Aggiungi indirizzo URL di descrizione dell'estensione JOSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
@@ -8036,7 +7923,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8108,4 +7995,9 @@
 msgstr "Preparazione dei dati in corso..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "Impossibile leggere \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -8117,7 +8009,69 @@
 msgstr "Impossibile leggere \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Nota: la GPL non è compatibile con la licenza di OSM. Non caricare tracce "
+"con licenza GPL."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "Files GPX"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "descrizione della traccia GPS"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Aggiungi informazioni sull'autore"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Nome reale"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Diritto d'autore (URL)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Predefinito"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "Copyright anno"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Parole chiave"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Opzioni di esportazione"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "Esporta e Salva"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Errore nella esportazione di {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Scegliere una licenza predefinita"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -8146,4 +8100,9 @@
 msgstr ""
 "Errore di scansione: struttura del documento non valida per un documento gpx"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Ruolo ''{0}'' sconosciuto."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8284,7 +8243,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "Analisi cartella {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8299,4 +8258,5 @@
 msgstr "Il server ha restituito un errore con codice {0}"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8328,4 +8288,32 @@
 msgstr "Login"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "Server dei File di OSM"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8395,30 +8383,26 @@
 msgstr "Errore nella scansione."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "Server dei File di OSM"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Versione sconosciuta"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr "I dati OSM sono privi del numero di versione"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr "Versione sconosciuta: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr "Trovato <nd> elemento in non-percorso."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "<nd> ha zero ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "Trovato etichetta <member> su una non relazione."
@@ -8473,5 +8457,5 @@
 msgstr "Attributo richiesto mancante \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8480,9 +8464,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "Tipo di membro sconosciuto per ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "Preparazione dati OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "Id del nodo malformato"
@@ -8608,9 +8597,9 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "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."
+"E'' stato richiesto il caricamento dell''estensione {0}. Questa estensione "
+"non è più necessaria."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8704,9 +8693,9 @@
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
+"L''estensione non può essere rimossa. Probabilmente è stata già disabilitata"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "Non è stata trovata alcuna informazione sulle estensioni."
+msgstr "Informazioni sull''estensione"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8733,5 +8722,5 @@
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
-msgstr ""
+msgstr "L''estensione con nome {0} non è disponibile. Aggiornamento ignorato."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
@@ -8853,4 +8842,6 @@
 "was: {1}"
 msgstr ""
+"Attenzione: è fallito il tentativo di accedere alla cartella ''{0}'' per "
+"ragioni di sicurezza. L''eccezione è stata: {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201
@@ -8860,4 +8851,6 @@
 "problem. JOSM will stop working."
 msgstr ""
+"Errore grave: non è stato possibile trovare l''immagine ''{0}''. Questo è un "
+"serio problema di configurazione. JOSM terminerà di funzionare."
 
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447
@@ -9102,23 +9095,23 @@
 msgstr "Trovato un file nullo nella cartella {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Errore durante il prelevamento dei file dalla cartella {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr "Correlazione ai dati GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} sono stati trovati etichettati dal gps"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "Apri immagini con AgPifoJ..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9372,5 +9365,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Errore durante il caricamento del file"
@@ -9419,30 +9412,13 @@
 msgstr "Selezionare la tabella di assemblaggio"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr "Catasto"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr "Sorgente auto-determinata"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr "Proiezione non valida"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr "Modificare prima la proiezione in {0}."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-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."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9455,9 +9431,9 @@
 "Si desidera ripristinare F11 per l'azione di cattura ?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr "Ripristino della scorciatoia F11 di cattura"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM si è fermato in attesa che il cambiamento abbia effetto."
@@ -9636,13 +9612,23 @@
 msgstr "Estrai le piante degli edifici"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr "Scarica immagine dal WMS francese del catasto"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Catasto: {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+#, fuzzy
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
+msgstr ""
+"Per abilitare l'estensione WMS del catasto, cambiare\n"
+"la proiezione di JOSM a Lambert e riavviare JOSM."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9712,5 +9698,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr "Regola WMS"
@@ -10447,22 +10433,27 @@
 msgstr "Impossibile acquisire l'immagine"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr "Connesso"
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr "Non connesso"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr "Connessione fallita"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "nome"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10495,11 +10486,11 @@
 msgstr "Livello LiveGPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
 msgstr "Cattura traccia GPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
@@ -10507,22 +10498,22 @@
 "LiveGPS."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center Once"
 msgstr "Centra una volta"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center the LiveGPS layer to current position."
 msgstr "Centra il livello LiveGPS sulla posizione corrente."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr "Centratura automatica"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Centra continuamente il livello LiveGPS sulla posizione corrente."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -10779,24 +10770,24 @@
 msgstr "Azioni permesse"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Il controllo remoto ha richiesto il caricamento dei dati dalle API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr "Dettagli della richiesta: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr "Si vuole permettere questo?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr "Conferma l'azione del controllo remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -11039,10 +11030,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
+#, fuzzy, java-format
+msgid "{0} start"
 msgstr "inizio"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr "fine"
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} nodo"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11594,10 +11587,10 @@
 msgstr "Percorsi incrociati"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr "Nodi duplicati"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Questo test verifica che non ci siano due nodi nella stessa posizione."
@@ -12154,5 +12147,5 @@
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
-msgstr ""
+msgstr "Mappa scannerizzata..."
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24
@@ -12160,4 +12153,6 @@
 "Display a map that was previously scanned and uploaded to walking-papers.org"
 msgstr ""
+"Visualizza una mappa che è stata precedentemente scannerizzata e caricata su "
+"walking-papers.org"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29
@@ -12165,4 +12160,6 @@
 "Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)"
 msgstr ""
+"Inserire un indirizzo URL o un ID (la parte dopo il ?id= nell''URL) di "
+"walking-papers.org"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70
@@ -12170,9 +12167,10 @@
 msgid "Could not read information from walking-papers.org the id \"{0}\""
 msgstr ""
+"Impossibile leggere le informazioni dell''id \"{0}\" da walking-papers.org"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60
 #, java-format
 msgid "Walking Papers: {0}"
-msgstr ""
+msgstr "Walking Papers: {0}"
 
 #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67
@@ -12309,9 +12307,33 @@
 msgstr "Nessun id o indirizzo URL WMS valido"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr "Correggere la posizione del layer WMS selezionato"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "Scegli la riga da modificare."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "Salva livello WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Start adjusting"
+msgstr "Inizia navigazione"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "Nessun cambiamento da caricare."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -12326,5 +12348,5 @@
 msgstr "Scaricamento automatico"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
@@ -12332,10 +12354,10 @@
 "Livello WMS ({0}), scaricamento automatico al livello di ingrandimento {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Livello WMS ({0}), scaricamento per il livello di ingrandimento {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12344,42 +12366,42 @@
 "oppure cambia risoluzione"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Scarica i tasselli visibili"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Cambia risoluzione"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Ricarica tile sbagliati"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Salva il livello WMS su file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr "Salva livello WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "Carica il livello WMS da file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr "Carica livello WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Versione del file WMS non supportata; trovata {0}, attesa {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Errore nel formato del file"
@@ -12558,4 +12580,5 @@
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
+"Visualizza le informazioni di navigazione come un grafo di navigazione."
 
 #. Plugin grid
@@ -13025,5 +13048,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -15580,5 +15603,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15880,5 +15903,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15981,5 +16004,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -20606,7 +20629,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "Superstrada"
+msgstr ""
 
 #. color tertiary
@@ -23785,5 +23807,5 @@
 msgstr "Insediamento urbano"
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23794,5 +23816,5 @@
 msgstr "Senso unico"
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23802,5 +23824,5 @@
 msgstr "Chiesa"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23811,5 +23833,5 @@
 msgstr "Stazione di rifornimento"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23820,5 +23842,5 @@
 msgstr "Acquisti"
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23828,5 +23850,5 @@
 msgstr "WC"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -24059,35 +24081,209 @@
 msgstr "Terraserver Urban"
 
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "E' fallita l'inizializzazione delle API. Riprovare più tardi."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Inizializzazione delle API fallita"
-
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
+#~ "Failed to access system property ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
 #~ msgstr ""
-#~ "Non è stato trovato alcun dato da aggiornare. E' stato già aperto o "
-#~ "scaricato un livello dati?"
-
-#~ msgid "No data"
-#~ msgstr "Nessun dato"
-
-#~ msgid "Update failed"
-#~ msgstr "Aggiornamento fallito"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Primitiva mancante"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Applica risoluzioni parziali"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Livelli: {0}"
+#~ "E'' fallito il tentativo di accedere alla proprietà di sistema ''{0}'' "
+#~ "per ragioni di sicurezza. L''eccezione è stata: {1}"
+
+#~ msgid "Unknown file extension for file ''{0}''"
+#~ msgstr "Estensione del file sconosciuta per il file ''{0}''"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "L'estensione del file è sconosciuta."
+
+#~ msgid "An error occurred while saving. Error is: {0}"
+#~ msgstr ""
+#~ "E'' stato generato un errore durante il salvataggio. L''errore è: {0}"
+
+#~ msgid "Move"
+#~ msgstr "Sposta"
+
+#~ msgid "Invalid projection"
+#~ msgstr "Proiezione non valida"
+
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Modificare prima la proiezione in {0}."
+
+#~ msgid "end"
+#~ msgstr "fine"
+
+#~ msgid "Not implemented yet."
+#~ msgstr "Non ancora implementato."
+
+#~ msgid "Data Layer"
+#~ msgstr "Livello dati"
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "unnamed"
+#~ msgstr "Senza nome"
+
+#~ 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 "{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"
+
+#~ msgid "Object"
+#~ msgstr "Oggetto"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Riporta lo stato di tutti gli oggetti correntemente selezionati alla "
+#~ "versione selezionata nella lista della cronologia."
+
+#~ 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 "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 "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 "Contacting the OSM server..."
+#~ msgstr "Connessione al server OSM..."
+
+#~ msgid "Add either site-josm.xml or Wiki Pages."
+#~ msgstr "Aggiungi sia site-josm.xml che le pagine Wiki."
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Nome utente (email) per l'account di OSM."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "Username OSM (email)"
+
+#~ msgid "Aborting..."
+#~ msgstr "Interruzione in corso"
+
+#~ msgid "Commit comment"
+#~ msgstr "Inserisci commento"
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Impossibile scaricare il plugin: {0} da {1}"
+
+#~ msgid "Navigation"
+#~ msgstr "Navigazione"
+
+#~ msgid "Revert"
+#~ msgstr "Ripristina"
+
+#~ 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 "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Adjust the position of the WMS layer"
+#~ msgstr "Aggiusta la posizione dl layer WMS"
+
+#~ 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 "Validate either current selection or complete dataset."
+#~ msgstr "Convalida la selezione corrente oppure tutto l'insieme dei dati."
+
+#~ msgid "Charge"
+#~ msgstr "Costo"
+
+#~ msgid "image not loaded"
+#~ msgstr "immagine non caricata"
+
+#~ 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 "Validate"
+#~ msgstr "Convalida"
+
+#~ msgid "rectifier id={0}"
+#~ msgstr "identificativo rectifier={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 ""
@@ -24097,177 +24293,4 @@
 #~ "Impossibile rimuovere l'estensione. Riportate il problema alle persone da "
 #~ "cui si è ottenuto JOSM."
-
-#~ msgid "Validate"
-#~ msgstr "Convalida"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Convalida la selezione corrente oppure tutto l'insieme dei dati."
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Non ancora implementato."
-
-#~ msgid "Data Layer"
-#~ msgstr "Livello dati"
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "unnamed"
-#~ msgstr "Senza nome"
-
-#~ 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 "{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"
-
-#~ msgid "Object"
-#~ msgstr "Oggetto"
-
-#~ msgid "Date"
-#~ msgstr "Data"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Riporta lo stato di tutti gli oggetti correntemente selezionati alla "
-#~ "versione selezionata nella lista della cronologia."
-
-#~ 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 "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 "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 "Contacting the OSM server..."
-#~ msgstr "Connessione al server OSM..."
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Aggiungi sia site-josm.xml che le pagine Wiki."
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Nome utente (email) per l'account di OSM."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "Username OSM (email)"
-
-#~ msgid "Aborting..."
-#~ msgstr "Interruzione in corso"
-
-#~ msgid "Commit comment"
-#~ msgstr "Inserisci commento"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Impossibile scaricare il plugin: {0} da {1}"
-
-#~ msgid "Navigation"
-#~ msgstr "Navigazione"
-
-#~ msgid "Revert"
-#~ msgstr "Ripristina"
-
-#~ 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 "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Aggiusta la posizione dl layer WMS"
-
-#~ 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 "Charge"
-#~ msgstr "Costo"
-
-#~ msgid "image not loaded"
-#~ msgstr "immagine non caricata"
-
-#~ 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 "rectifier id={0}"
-#~ msgstr "identificativo rectifier={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 "Add Selected"
@@ -24402,4 +24425,7 @@
 #~ msgstr "Geofabrik.de dell'Alto Palatinato"
 
+#~ msgid "Layers: {0}"
+#~ msgstr "Livelli: {0}"
+
 #~ msgid "Conflicts: {0}"
 #~ msgstr "Conflitti: {0}"
@@ -24475,4 +24501,11 @@
 #~ 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:"
@@ -24508,7 +24541,4 @@
 #~ msgid "Remove route nodes"
 #~ msgstr "Rimuovi nodi dell'itinerario"
-
-#~ msgid "Start routing"
-#~ msgstr "Inizia navigazione"
 
 #~ msgid ""
@@ -24567,4 +24597,7 @@
 #~ msgstr "Risolvi conflitti nella lista dei membri della relazione {0}"
 
+#~ msgid "Apply partial resolutions"
+#~ msgstr "Applica risoluzioni parziali"
+
 #~ msgid "WARNING: unexpected value for preference conflict.resolution, got "
 #~ msgstr ""
@@ -24586,4 +24619,7 @@
 #~ msgstr "Ripristino via"
 
+#~ msgid "Update failed"
+#~ msgstr "Aggiornamento fallito"
+
 #~ msgid "Selection too big"
 #~ msgstr "Selezione troppo grande"
@@ -24592,7 +24628,16 @@
 #~ msgstr "Errore durante la comunicazione con il server."
 
+#~ msgid "API initialization failed"
+#~ msgstr "Inizializzazione delle API fallita"
+
+#~ msgid "Missing primitive"
+#~ msgstr "Primitiva mancante"
+
 #~ msgid "image loading..."
 #~ msgstr "caricamento immagine..."
 
+#~ msgid "Failed to initialize API. Please try again later."
+#~ msgstr "E' fallita l'inizializzazione delle API. Riprovare più tardi."
+
 #~ msgid "Layer {0} must be in list of layers"
 #~ msgstr "Il livello {0} deve essere presente nella lista dei livelli"
@@ -24606,2 +24651,5 @@
 #~ msgid "Members: {0} (linked: {1})"
 #~ msgstr "Membri: {0} (collegato: {1})"
+
+#~ msgid "No data"
+#~ msgstr "Nessun dato"
Index: /applications/editors/josm/i18n/po/ja.po
===================================================================
--- /applications/editors/josm/i18n/po/ja.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/ja.po	(revision 16973)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-07-14 17:51+0000\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-04 10:42+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -16,13 +16,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:33+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -47,15 +40,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -80,7 +65,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -88,4 +73,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -107,8 +96,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "エラー"
@@ -120,5 +111,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "保存されていない変更"
@@ -138,16 +129,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -159,13 +149,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -182,4 +173,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "キャンセル"
@@ -193,5 +185,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -200,5 +192,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -209,23 +202,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -246,5 +239,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "警告"
@@ -278,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -309,5 +302,5 @@
 msgstr "バグ報告"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -368,19 +361,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "削除する列を選択してください。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "ほかを選択："
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "ノードの結合"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -419,5 +409,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -450,18 +440,18 @@
 msgstr "経度"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "ノードを円形に配列"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "選択したノードを円形に移動します"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -490,18 +480,18 @@
 msgstr "ツール: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "少なくとも４つのノードを選択してください。"
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -514,5 +504,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -635,13 +625,13 @@
 msgstr "複数のウエイを一つに結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "結合する少なくとも二つのウエイを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "異なるメンバーであるウェイを結合しますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -651,13 +641,13 @@
 "か？"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "強制的に連結。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "方向を変更しますか?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -665,9 +655,9 @@
 msgstr "ウエイは現在の方向で結合できません。一方の方向にそろえますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "逆転して接続"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -676,5 +666,5 @@
 msgstr "すべての競合に値を入力してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -682,14 +672,14 @@
 msgstr "競合を解決する"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0}ウェイを結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "ウェイが全て空です。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -707,24 +697,23 @@
 msgstr "選択したオブジェクトをペースト用バッファにコピーします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "コピーするものを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "円形を作成します"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "3つのノードから円形を作成します"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "円形内にそのノードはありません。"
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -736,8 +725,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -757,15 +746,15 @@
 msgstr "選択したオブジェクトを削除します"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "上書きする"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "ファイルが存在します。上書きしますか？"
@@ -826,5 +815,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -834,7 +823,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "ダウンロード中にエラーです。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -845,5 +833,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "複製"
@@ -867,92 +856,36 @@
 msgstr "アプリケーションを終了します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"備考：GPLは、OSMライセンスと互換性がありません。GPLでライセンスされているト"
-"ラックをアップロードしないでください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "GPXにエクスポート"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "データをGPXファイルにエクスポートします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "エクスポートできません。最初にデータを取得してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "gpsトラックの記述"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "著者情報の追加"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "本名"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr "eメール"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Copyright (URL)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "事前定義"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "Copyright 年"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "キーワード"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "エキスポートのオプション"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "エキスポートして保存"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"エキスポートの際にエラー {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "事前定義のライセンスを選択"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "データをGPXファイルにエクスポートします。"
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -968,6 +901,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1038,5 +971,5 @@
 msgstr "ノードを一番近いセグメントに接続します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "ノードと線をつなぐ"
@@ -1047,12 +980,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "強制的に結合"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "直下のレイヤーを選択したレイヤーに結合します"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1095,12 +1026,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "選択"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "選択したメンバーを一つ下に移動します"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1160,5 +1089,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "新規"
@@ -1233,5 +1162,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
-#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1239,7 +1167,4 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 msgstr ""
-"<html>EPSG:4326投影法を使用しています。この投影法では、<br>長方形の配置を行っ"
-"た場合に、意図しない結果になるおそれがあります。<br>対応するには、投影法を変"
-"更してください。<br>それでも続けますか？"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1253,5 +1178,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "貼り付け"
@@ -1263,5 +1188,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "タグの貼り付け"
@@ -1309,7 +1234,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "ファイル\"{0}\"の名前を変更できませんでした。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1346,5 +1271,10 @@
 msgstr "ファイル {0}は存在します。上書きしますか?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "一つも開かれたデータがありませんんで、保存されません。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1354,25 +1284,25 @@
 "てください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "一つも開かれたデータがありませんんで、保存されません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "空の文書"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "文書にデータが含まれない"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "それでも保存する"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "競合"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1382,57 +1312,19 @@
 "れます。続けますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "競合を否定して保存する"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "OSMファイルの保存"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "GPXファイルの保存"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "レイヤーを保存"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "ファイルをバックアップできませんでした。"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "ファイルの拡張子が不明です: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr "保存中にエラー発生"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr "バックアップファイルから復元するときに、エラーになりました。"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "ファイルの拡張子が不明です"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "保存中にエラー発生"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr "バックアップファイルから復元するときに、エラーになりました。"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1543,25 +1435,17 @@
 "する）"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
 "should verify this and correct it when necessary.</html>"
 msgstr ""
-"リレーションのメンバーが持つロールは、新しい全てのウェイにコピーされまし"
-"た。\n"
-"確認して、必要なら訂正してください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
-#, fuzzy
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
 "this and correct it when necessary.</html>"
 msgstr ""
-"リレーションのメンバーが持つロールは、新しい全てのウェイにコピーされまし"
-"た。\n"
-"確認して、必要なら訂正してください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1703,7 +1587,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
-#, fuzzy
 msgid "No current dataset found"
-msgstr "GPXデータのレイヤーがありません"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
@@ -1816,7 +1699,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "OSMサーバにすべての変更をアップロードします。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1974,12 +1856,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "アップロードするデータ"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr "次のエラーは、大量ダウンロードのときに起きました。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -2019,5 +1900,5 @@
 msgstr "モード: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2027,6 +1908,6 @@
 "ノードは消さない。 Ctrl: 参照するオブジェクトを消す。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2037,8 +1918,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2083,38 +1964,38 @@
 msgstr "選択済の"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "世界の外にノードを追加できません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "ノードを追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "ノードでウェイに追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "既存のウェイをノードとつなぎます。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "既存のウェイに新しいノードを追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "ウェイのノードを追加して接続"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "新規ノードの作成"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "カーソルの下のノードを選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2122,14 +2003,14 @@
 msgstr[0] "新規ノードを {0}このウエイに追加します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "新規ウエイを最後に操作したノードから開始"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "最後に操作したノードからウエイを継続"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "描画の完了"
@@ -2149,5 +2030,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "矩形範囲でオブジェクトを選択し、マウスボタンを離してください。"
@@ -2158,5 +2039,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "回転を止めるには、マウスボタンを放します。"
@@ -2192,9 +2073,9 @@
 msgstr[0] "仮の新規ノードを {0}本のウェイに追加し、動かしてください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2204,13 +2085,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2219,5 +2100,5 @@
 "マージします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2448,26 +2329,26 @@
 "\"relation\"です。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "想定外のトークン: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr "orに引数がありません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr "not に引数がありません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "閉じ括弧があるはずです。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr "間違った数のパラメータが、ノード演算子に渡されました。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2476,5 +2357,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2563,8 +2444,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "矛盾の解決"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2576,10 +2456,10 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "\"{0}\"にマッチするものが見つからない"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2623,5 +2503,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "関連から削除"
@@ -2636,5 +2516,5 @@
 "関連から削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr "ウェイのセグメントを分割"
@@ -2642,5 +2522,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2652,8 +2533,7 @@
 "起こします。<br>本当に削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "関連から削除"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2663,9 +2543,222 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "移動"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "{0}ノードを結合する"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "{0}ノード"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "シーケンス"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "適用しますか?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"このウェイを反転するならば、データの一貫性を保つため、ウェイとそのノードのプ"
+"ロパティーに対する以下の変更が推奨されます。"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "関連"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "古いロール"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "新しいロール"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "古いキー"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "古い値"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "新しいキー"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "新しい値"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "選択した変更を適用します"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "変更を適用しません"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "適用したいプロパティの変更を選択してください。"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "プロパティ "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr "次を参照する関連中のロール"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "自動タグ修正"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "不正な設定がファイルの{0}行目にあります。"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "情報ディレクトリを読み取れません: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr ""
+"設定ファイルにエラーがあります。古いファイルのバックアップを{0}に作ります。"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "設定は{0}に保存"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "設定をアップロードできませんでした。理由: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "サーバから設定をロードできませんでした。"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "十進経緯度"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "度分秒"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "南"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "北"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "西"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "東"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "{0}このオブジェクトを変更"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "不完全"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2678,211 +2771,4 @@
 msgstr[0] "ノード"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "シーケンス"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "適用しますか?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"このウェイを反転するならば、データの一貫性を保つため、ウェイとそのノードのプ"
-"ロパティーに対する以下の変更が推奨されます。"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "関連"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "古いロール"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "新しいロール"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "古いキー"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "古い値"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "新しいキー"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "新しい値"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "選択した変更を適用します"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "変更を適用しません"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "適用したいプロパティの変更を選択してください。"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "プロパティ "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr "次を参照する関連中のロール"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "自動タグ修正"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "不正な設定がファイルの{0}行目にあります。"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "情報ディレクトリを読み取れません: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr ""
-"設定ファイルにエラーがあります。古いファイルのバックアップを{0}に作ります。"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "設定は{0}に保存"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "設定をアップロードできませんでした。理由: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "サーバから設定をロードできませんでした。"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "十進経緯度"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "度分秒"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "南"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "北"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "西"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "東"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "不完全"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2913,5 +2799,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2943,5 +2829,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -2949,22 +2835,22 @@
 msgstr[0] "{0} メンバー"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "道路"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "鉄道"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "水路"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "土地利用"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -3028,10 +2914,12 @@
 msgstr "マルチポリゴンのウェイ \"{0}\"は閉じていません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "リレーションに登録すべきものがありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3039,5 +2927,5 @@
 msgstr "メンバー \"{0}\"を関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3045,57 +2933,57 @@
 msgstr "ウエイ\"{0}\"は二つ未満のポイントです。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr "二つ以上の\"from\"ウェイがあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr "二つ以上の\"to\"ウェイがあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr "経由地が複数有ります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "不明なロール\"{0}\"です。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "{0}のメンバーのタイプが不明"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr "\"from\"ウェイが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr "\"to\"ウェイが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr "経由地かウエイが見つかりません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "\"from\"ウェイは、\"via\"ノードで開始または終了していません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "\"to\"のウエイは\"via\"のノードで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "\"from\" のウエイは\"via\"のウエイで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "\"to\"のウエイは\"via\"のウエイで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3147,5 +3035,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3179,4 +3067,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3216,13 +3108,25 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "ブックマークを読み込めません。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "ブックマークを書き込みできません。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3255,4 +3159,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3284,14 +3189,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "予期しない例外"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
-msgstr "osmサーバに接続できません。インターネット接続 をチェックしてください。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3520,6 +3424,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3548,39 +3452,39 @@
 msgstr "音声"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "右へ移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "マップ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "左へ移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "上へ移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "下へ移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "ズームイン"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "ズームアウト"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "拡大・縮小"
@@ -3614,10 +3518,10 @@
 msgstr "(オブジェクトなし)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "レイヤーがリストにありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3699,12 +3603,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3713,6 +3617,6 @@
 msgstr "タグ"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3720,47 +3624,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#, java-format
+msgid "{0} pending tag conflicts to be resolved"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
-#, java-format
-msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3768,25 +3672,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
@@ -3986,8 +3890,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4206,5 +4110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4217,5 +4121,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4250,6 +4154,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4262,6 +4166,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4332,7 +4236,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4395,7 +4299,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "とりあえず続ける"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4422,7 +4325,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "競合の解決"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4471,99 +4374,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "レイヤー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "全ての読み込んだレイヤのリストを開きます"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "選択したレイヤーの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "保存していない変更があります。それでもレイヤーを削除しますか？"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "レイヤー削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "本当にすべてのレイヤーを削除してよろしいですか?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "情報"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "はい"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "北"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "削除"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "削除 {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "表示/非表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "選択したレイヤーの表示状態を切り替え"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "私道"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "選択したレイヤーの削除"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "直下のレイヤーを選択したレイヤーに結合します"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "選択したレイヤーを一つ上に上げます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "選択したレイヤーを一つ下に移動します。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "情報板"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4571,22 +4467,22 @@
 msgstr[0] "これは、最大{0}このオブジェクトが変更されます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "空の値でキーを削除。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<差異あり>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "値を変更しますか?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4594,5 +4490,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4600,49 +4496,40 @@
 msgstr[0] "{0}このオブジェクトのプロパティーの変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "キーを選択してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "値を選択してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Please select the objects you want to change properties for."
 msgstr "プロパティを変えたいオブジェクトを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "選択されたオブジェクトのプロパティ"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "関連の変更"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "本当に関連{0}から選択分を削除しますか？"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "プロパティの追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4659,63 +4546,77 @@
 msgstr "追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Add a new key/value pair to all objects"
 msgstr "すべてのオブジェクトに新しいキー/値をペアで追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "プロパティの編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 msgid "Edit the value of the selected key for all objects"
 msgstr "すべてのオブジェクトの選択したキーの値の編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "プロパティ: {0} / メンバー: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "プロパティ/メンバー"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "関連の変更"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "本当に関連{0}から選択分を削除しますか？"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "すべてのオブジェクトの選択したキーの削除"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "プロパティの削除"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "すべてのオブジェクトの選択したキーの削除"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "プロパティ: {0} / メンバー: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "プロパティ/メンバー"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "リレーション"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "全てのリレーションのリストを開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "リレーション: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "選択したリレーションの編集画面を開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "選択したリレーションを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "新規リレーション作成"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4746,5 +4647,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4812,5 +4713,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -4821,21 +4722,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "エリアをダウンロードする"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "選択したリレーションを削除"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "見えるタイルのダウンロード"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr ""
@@ -4854,17 +4752,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "リレーション"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "プラグイン {0} をダウンロードしています..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -4882,7 +4779,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "リレーション"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -4893,9 +4789,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -4904,15 +4800,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "最後に戻した処理を再度行います。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -4922,9 +4817,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -4934,15 +4829,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -4950,5 +4845,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -4956,65 +4851,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
+#, fuzzy
+msgid "Select primitives for selected relation members"
+msgstr "選択したリレーションを削除"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "現在選択したメンバーを一つ上に移動します"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "選択したメンバーを一つ下に移動します"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "現在選択されている全てのオブジェクトを関連から削除"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "選択したリレーションを削除"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr "接続していません"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5023,10 +4933,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "競合中のリレーション"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -5035,21 +4944,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "最新データを保存します。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5059,37 +4967,37 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "この関連の全ての未完成のウェイとノードをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "メンバーのダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5099,31 +5007,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
-msgstr "リモート制御の指示を確認した"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "ズームアウト"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "選択したメンバーを一つ下に移動します"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5184,7 +5085,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "セレクションのロード"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -5218,7 +5118,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "ロケーションの変更"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6350,5 +6249,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "ジオタグのついた画像"
@@ -6374,5 +6273,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6390,5 +6289,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEGイメージ(*.jpg)"
@@ -6426,43 +6325,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "GPSポイント"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "線描画のカスタマイズ"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "全体設定を使用"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "このレイヤーの点の間に線を引く。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "このレイヤーの点の間に線を引かない。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "線描画オプションの選択"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "配色のカスタマイズ"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6470,6 +6369,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6540,10 +6439,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "データレイヤーへ変換"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6555,11 +6454,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6568,29 +6467,29 @@
 msgstr "{0}からのコンバート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr "このトラックに沿ってOSMからダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "次の範囲内の全てをダウンロード:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} メータ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "リクエストあたりの最大面積："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} 平方キロメートル"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6601,9 +6500,9 @@
 "すか？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "No GPX track available in layer to associate audio with."
 msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6613,5 +6512,5 @@
 "に変更又は移動されました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6663,5 +6562,5 @@
 msgstr "GPXレイヤーの変換"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6685,10 +6584,10 @@
 msgstr[0] "トラック"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
 msgstr[0] "ポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6696,5 +6595,5 @@
 msgstr[0] "{0}ポイントをもつトラック"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6702,5 +6601,5 @@
 msgstr[0] "{1}トラックを含む {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6708,14 +6607,14 @@
 msgstr[0] "{0} ポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "GPSマーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
 msgstr[0] "マーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6723,9 +6622,9 @@
 msgstr[0] "{0}は、{1}マーカーからなる"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "音声の同期"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -6734,5 +6633,5 @@
 "す。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6740,14 +6639,14 @@
 msgstr "地点 {0}で音声同期をとります"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 msgid "Unable to synchronize in layer being played."
 msgstr "再生されているレイヤーと同期させることができません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 msgid "Make Audio Marker at Play Head"
 msgstr "再生の最初に音声マーカーを作成します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6755,13 +6654,13 @@
 msgstr "マークしたいトラックポイントでオーディオを一時停止する必要があります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 msgid "No existing audio markers in this layer to offset from."
 msgstr "このレイヤには、開始オフセットを指すオーディオマーカーがありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "テキスト/アイコンの表示/非表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr "マーカーテキストとアイコンの表示状態を切り替え"
@@ -7385,7 +7284,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
-#, fuzzy
 msgid "JOSM Plugin description URL"
-msgstr "JOSM プラグイン情報のURLの追加"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
@@ -7784,7 +7682,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -7855,4 +7753,9 @@
 msgstr "データを準備中..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "\"{0}\"を読み込めません。"
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -7864,7 +7767,69 @@
 msgstr "\"{0}\"を読み込めません。"
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"備考：GPLは、OSMライセンスと互換性がありません。GPLでライセンスされているト"
+"ラックをアップロードしないでください。"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "GPXファイル"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "gpsトラックの記述"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "著者情報の追加"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "本名"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr "eメール"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Copyright (URL)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "事前定義"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "Copyright 年"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "キーワード"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "エキスポートのオプション"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "エキスポートして保存"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"エキスポートの際にエラー {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "事前定義のライセンスを選択"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -7892,4 +7857,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "パースエラー：GPXファイルのドキュメント構造が不適切です"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "不明なロール\"{0}\"です。"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8024,7 +7994,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "ディレクトリ {0} を走査"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8039,4 +8009,5 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8068,4 +8039,32 @@
 msgstr "ログイン"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "OSMサーバファイル"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8123,30 +8122,26 @@
 msgstr "パース中にエラーが発生しています"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "OSMサーバファイル"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "バージョン番号は不明です"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr "OSMデータにバージョン番号が欠けています。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr "不明なバージョン: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr "ウエイ以外で<nd>要素が見つかりました"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "<nd> はゼロ参照です。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "<member>要素がリレーション以外に見つかりました"
@@ -8196,5 +8191,5 @@
 msgstr "必要な属性\"{0}\"がありません"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8203,9 +8198,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "{0}のメンバーのタイプが不明"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "OSMデータを準備します…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "III-形式のノードID"
@@ -8328,9 +8328,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
-"警告 - {0}プラグインのロードを要求されています。このプラグインはもう必須では"
-"ありません。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8424,7 +8422,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "プラグイン情報が見つかりません。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8814,23 +8811,23 @@
 msgstr "ディレクトリ {0}に中身のないファイルが見つかりました\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "ディレクトリからファイルを入手中のエラー {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr "GPXに関連づける"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} は gps タグがつけられていることがわかりました。"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "AgPifoJで画像を開く..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9082,5 +9079,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "ファイルの読み込みエラー"
@@ -9129,30 +9126,13 @@
 msgstr "Tableau d'Assemblageを選択"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr "自動ソーシング"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr "投影法が無効"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr "最初に投影法を {0} に変えてください。"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the JOSM projection to Lambert and restart"
-msgstr ""
-"土地台帳WMSプラグインを可能にするために、JOSMの座標系をランバート投影法に変え"
-"て、再起動してください。"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9161,9 +9141,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
@@ -9326,13 +9306,23 @@
 msgstr "建物のフットプリントの抽出"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr "フランスのCadastre WMSからイメージのダウンロード"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Cadastre: {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+#, fuzzy
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
+msgstr ""
+"土地台帳WMSプラグインを可能にするために、JOSMの座標系をランバート投影法に変え"
+"て、再起動してください。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9398,5 +9388,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr "WMSの調整"
@@ -10116,22 +10106,27 @@
 msgstr "イメージを取得できませんでした"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr "接続中です"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr "接続しました"
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr "接続していません"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr "接続失敗"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "名前"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10164,32 +10159,32 @@
 msgstr "LiveGPSレイヤー"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
 msgstr "GPSトラックの取り込み"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr "gpsdサーバに接続し、LiveGPSレイヤーに現在位置を表示します。"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center Once"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center the LiveGPS layer to current position."
 msgstr "現在の位置をLiveGPSのレイヤーの中心にする。"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr "自動中心設定"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -10431,5 +10426,5 @@
 msgstr "許可されたアクション"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
@@ -10437,20 +10432,20 @@
 "求されました。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr "リクエストの詳細: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr "本当にこれを許可してよろしいですか？"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr "リモート制御の指示を確認した"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -10691,10 +10686,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
+#, fuzzy, java-format
+msgid "{0} start"
 msgstr "開始"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr "終了"
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0}ノード"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11220,10 +11217,10 @@
 msgstr "交差するウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr "ノードの複製"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "このテストは全く同じ位置にノードがないことをチェックします。"
@@ -11884,9 +11881,33 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr "選択されたWMSレイヤーの位置を調整してください。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "編集する列を選択してください。"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "レイヤー削除"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Start adjusting"
+msgstr "ルーティングの開始"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "アップロードする変更はありません。"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11899,15 +11920,15 @@
 msgstr "自動ダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS レイヤ ({0}), 自動的に倍率 {1} でダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS レイヤ ({0}), 自倍率 {1} でダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -11915,42 +11936,42 @@
 "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "見えるタイルのダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "解像度の変更"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "誤ったタイルのリロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "アルファチャンネル"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "WMSレイヤーをファイルに保存"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "WMSレイヤーをファイルから読み込む"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "ファイルフォーマットエラー"
@@ -12547,5 +12568,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -15105,5 +15126,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15405,5 +15426,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15506,5 +15527,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -20131,7 +20152,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "モータースポーツ"
+msgstr ""
 
 #. color tertiary
@@ -23310,5 +23330,5 @@
 msgstr "村・市"
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23319,5 +23339,5 @@
 msgstr "一方通行"
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23327,5 +23347,5 @@
 msgstr "教会"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23336,5 +23356,5 @@
 msgstr "ガソリンスタンド"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23345,5 +23365,5 @@
 msgstr "買い物"
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23353,5 +23373,5 @@
 msgstr "トイレ"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23584,29 +23604,18 @@
 msgstr ""
 
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "更新するデータは見つかりませんでした。もう既にデータレイヤーを開いている"
-#~ "か、ダウンロードしましたか？"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "レイヤー：{0}"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "この関連から現在の行のメンバーを削除"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "プラグインを削除できませんでした。JOSMを入手した方に問題を報告してくださ"
-#~ "い。"
-
-#~ msgid "Validate"
-#~ msgstr "検証"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "現在の選択か、全てのデータ一式の検証"
+#~ msgid "Unknown file extension."
+#~ msgstr "ファイルの拡張子が不明です"
+
+#~ msgid "Move"
+#~ msgstr "移動"
+
+#~ msgid "Invalid projection"
+#~ msgstr "投影法が無効"
+
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "最初に投影法を {0} に変えてください。"
+
+#~ msgid "end"
+#~ msgstr "終了"
 
 #~ msgid "Data Layer"
@@ -23666,4 +23675,7 @@
 #~ msgid "Revert"
 #~ msgstr "取り消す"
+
+#~ msgid "Layers: {0}"
+#~ msgstr "レイヤー：{0}"
 
 #~ msgid "Contacting the OSM server..."
@@ -23754,4 +23766,7 @@
 #~ msgstr "現在選択されている全てのオブジェクトをメンバーとして追加"
 
+#~ msgid "Remove the member in the current table row from this relation"
+#~ msgstr "この関連から現在の行のメンバーを削除"
+
 #~ msgid "Error parsing server response."
 #~ msgstr "サーバからの応答内容が不正です。"
@@ -23785,4 +23800,10 @@
 #~ msgstr "TCXファイルをTCXファイルとしてインポート"
 
+#~ msgid "Validate"
+#~ msgstr "検証"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "現在の選択か、全てのデータ一式の検証"
+
 #~ msgid "Adjust the position of the WMS layer"
 #~ msgstr "WMSレイヤーの位置を調整"
@@ -23808,4 +23829,11 @@
 #~ msgid "Charge"
 #~ msgstr "料金"
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr ""
+#~ "プラグインを削除できませんでした。JOSMを入手した方に問題を報告してくださ"
+#~ "い。"
 
 #~ msgid ""
@@ -23900,4 +23928,11 @@
 
 #~ msgid ""
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
+#~ msgstr ""
+#~ "更新するデータは見つかりませんでした。もう既にデータレイヤーを開いている"
+#~ "か、ダウンロードしましたか？"
+
+#~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
@@ -23928,7 +23963,4 @@
 #~ msgid "Remove route nodes"
 #~ msgstr "ルートノードの削除"
-
-#~ msgid "Start routing"
-#~ msgstr "ルーティングの開始"
 
 #~ msgid "Edit Portcullis"
Index: /applications/editors/josm/i18n/po/nb.po
===================================================================
--- /applications/editors/josm/i18n/po/nb.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/nb.po	(revision 16973)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-07-28 20:58+0000\n"
-"Last-Translator: Kurt Nielsen <Unknown>\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-04 11:11+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,13 +16,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:32+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -47,15 +40,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -80,7 +65,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -88,4 +73,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -107,8 +96,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Feil"
@@ -119,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Ulagrede endringer"
@@ -137,16 +128,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -158,13 +148,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -181,4 +172,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "Avbryt"
@@ -192,5 +184,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -199,5 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -208,23 +201,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -245,5 +238,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Advarsel"
@@ -277,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -308,5 +301,5 @@
 msgstr "Feilrapporter"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -370,19 +363,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Velg raden som skal slettes"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Velg:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "Samle noder"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -421,5 +411,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -452,18 +442,18 @@
 msgstr "Lengdegrad"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Juster nodene til en sirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Flytt de valgte nodene i en sirkel."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -492,18 +482,18 @@
 msgstr "Verktøy: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Velg minst fire noder."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -516,5 +506,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -642,13 +632,13 @@
 msgstr "Sammenføy flere linjer til én"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Velg minst to linjer å sammenføye."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "Sammenføye linjer med forskjellig tilhørighet?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -656,13 +646,13 @@
 msgstr "Vil du virkelig sammenføye linjer med forskjellig tilhørighet?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "Sammenføy uansett"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Endre retninger?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -672,9 +662,9 @@
 "retningen på noen av linjene?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Snu og sammenføy"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -683,5 +673,5 @@
 msgstr "Legg inn verdier for alle konflikter."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -689,14 +679,14 @@
 msgstr "Løs konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Sammenføy {0} linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "Alle linjene var tomme"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -713,24 +703,23 @@
 msgstr "Kopier valgte objekter til utklippstavla."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Velg noe å kopiere."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Lag en sirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Lag en sirkel fra tre valgte noder."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "Valgte noder er ikke i en sirkel."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -744,8 +733,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -765,15 +754,15 @@
 msgstr "Slett valgte objekter."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Skriv over"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "Filen finnes. Vil du overskrive filen?"
@@ -834,5 +823,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -842,7 +831,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "Feil under nedlasting"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -853,5 +841,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Fordoble"
@@ -875,92 +864,36 @@
 msgstr "Avslutt programmet."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Merk: GPL er ikke kompatibel med OSM-lisensen. Ikke last opp GPL-lisensierte "
-"spor."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Eksporter til GPX …"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Eksporter dataene til GPX-fil."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Ingenting å eksportere. Hent inn data først."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "beskrivelse av sporloggen"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Legg til informasjon om opphavsperson"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Fullt navn"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr "E-post"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Opphavsrett (URL)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Forhåndsvalgt"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "År for opphavsrett"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Stikkord"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Innstillinger for eksport"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "Eksporter og lagre"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Det oppsto feil i eksport av {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Velg en lisens"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "Eksporter dataene til GPX-fil."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -976,6 +909,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1048,5 +981,5 @@
 msgstr "Inkluder node i nærmeste linjesegment"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "Sammenføy node og linje"
@@ -1057,12 +990,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Samle noder allikevel"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "Sammenføy laget under med dette."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1106,12 +1037,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "utvalg"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Oppdaterer de valgte objektene fra tjeneren"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1171,5 +1100,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "Ny"
@@ -1244,5 +1173,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
-#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1250,7 +1178,4 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 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?"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1264,5 +1189,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Lim inn"
@@ -1274,5 +1199,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Lim inn egenskaper"
@@ -1319,7 +1244,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Klarte ikke gi nytt navn til fila «{0}»."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1356,5 +1281,10 @@
 msgstr "Filen {0} finnes allerede. Vil du skrive over den?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "Fant ingen skjæring. Ingen endringer ble gjort."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1363,25 +1293,25 @@
 "Feilmelding: cannot check conditions for no layer. Send inn en feilmelding."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "Ingen åpne dokument å lagre"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Tomt dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "Dokumentet er tomt."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "Lagre uansett"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1391,59 +1321,19 @@
 "du fortsette?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "Avvis konflikter og lagre"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "Lagre OSM-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "Lagre GPX-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "Lagre lag"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Kan ikke ta sikkerhetskopi."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Ukjent filtype {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr ""
-"<html>Det oppstod en feil under kommunikasjon med tjeneren.<br>Detaljer: {0}"
-"</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr "Det oppsto feil under gjenoppretting fra sikkerhetskopi."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Ukjent filtype."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "Det oppsto feil under lagring."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr "Det oppsto feil under gjenoppretting fra sikkerhetskopi."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1551,23 +1441,17 @@
 "linjen.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
 "should verify this and correct it when necessary.</html>"
 msgstr ""
-"Medlemskap i en relasjon basert på en rolle er kopiert til alle nye linjer.\n"
-"Sjekk og korriger slik at dette er riktig."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
-#, fuzzy
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
 "this and correct it when necessary.</html>"
 msgstr ""
-"Et relasjonsmedlemskap  er kopiert til alle nye linjer.\n"
-"Sjekk og korriger slik at dette er riktig."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1704,12 +1588,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
-#, fuzzy
 msgid "No current dataset found"
-msgstr "Fant ikke GPX lag"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
-#, fuzzy
 msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr "Fant ikke objekt med ID {0} i gjeldende datasett"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
@@ -1829,7 +1711,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "Last opp alle endringer til OSM-tjeneren."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1968,8 +1849,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
@@ -1987,12 +1868,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "Laster opp data"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr "Følgende feil oppstod under massenedlasting:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -2037,5 +1917,5 @@
 msgstr "Modus: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2045,6 +1925,6 @@
 "når linjer slettes. Ctrl: slett objekt med referanse."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2055,8 +1935,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2101,38 +1981,38 @@
 msgstr "valgt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "Kan ikke legge til node utenfor kartet."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Legg til node"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Legg til node i linje"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "Knytt eksisterende linje til node"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Legg til en node i eksisterende linje"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "Legg til node i linje og lag tilknytning"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "Lag ny node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "Veg node under pekeren."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2141,14 +2021,14 @@
 msgstr[1] "Sett inn ny node i {0} linjer."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "Start ny linje fra siste node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "Fortsett samme linje fra siste node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "Avslutt tegning."
@@ -2168,5 +2048,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Slipp museknappen for å velge objektene i rektangelet."
@@ -2177,5 +2057,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "Slipp museknappen for å avslutte rotasjon."
@@ -2212,9 +2092,9 @@
 msgstr[1] "Legg til og flytt en kunstig node til {0} linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr "Flytt elementer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2226,13 +2106,13 @@
 "ofte en feil."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr "Flytt dem"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr "Angre flytting"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2241,5 +2121,5 @@
 "nærmeste node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2468,26 +2348,26 @@
 msgstr "Ukjent objekttype: {0}. Tillatte verdier er node, way og relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Uventet symbol: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr "OR mangler argument."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr "NOT mangler argument."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "Forventer parentes slutt."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Feil antall parametere for nodes-operator."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2498,5 +2378,5 @@
 "intervall, for eksempel nodes:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2586,23 +2466,22 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Løs Konflikt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
 "primitmive ''{1}''"
-msgstr "allerede registrert en konflikt for primitiv \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "Fant ingen treff for «{0}»"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2648,5 +2527,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "Slett fra relasjon"
@@ -2661,5 +2540,5 @@
 "Vil du slette utvalget fra relasjonen?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr "Splitt linje i segment"
@@ -2667,5 +2546,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2677,8 +2557,7 @@
 "nå) .<br>Er du sikker på at du vil slette nodene?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "Slett fra relasjon"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2688,9 +2567,225 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Flytt"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "Samle {0} noder"
+msgstr[1] "Samle {0} noder"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr "Rydder ut 1 objekt"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr "fjerner henvisning fra vei {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+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}."
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr "fjerner henvisning fra relasjon {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr "Løs medlemskonflikter i relasjon {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr "Fjern relasjonsmedlem {0} {1}"
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "Roter {0} {1}"
+msgstr[1] "Roter {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Sekvens"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "Løs {0} egenskapskonflikter i {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr "Gjenopprett {0} objekter"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr "Løs versjonskonflikter for {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr "Løs nodekonflikter i vei {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr "Hoveddatasettet inneholder ikke node {0}"
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Gjennomføre?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"Når du snur reningen på denne linjen blir følgende egenskaper endret for å "
+"opprettholde dataintegritet."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Relasjon"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Tidligere rolle"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "Ny rolle"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Tidligere nøkkel"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Tidligere verdi"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Ny nøkkel"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "Ny verdi"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Bruk valgte endringer"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Ikke bruk endringer"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "Velg hvilke endringer som skal brukes."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Egenskaper for "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr "Roller i relasjoner som viser til"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Korriger egenskap automatisk"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Innstillingsfil har feil i linje {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Kan ikke åpne innstillingsmappe: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr "Feil i innstillingsfila. Lagrer sikkerhetskopi i {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Innstillinger lagret i {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Kunne ikke laste opp innstillinger. Årsak: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "Klarte ikke lese innstillinger fra tjener."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr "allerede registrert en konflikt for primitiv \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "Desimalgrader"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "Grader, minutter, sekunder"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "V"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "Ø"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "Endre {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr "parameter {0} > 0 nødvendig. Leste {1}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "uferdig"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2704,212 +2799,4 @@
 msgstr[1] "noder"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr "Rydder ut 1 objekt"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr "fjerner henvisning fra vei {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-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}."
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr "fjerner henvisning fra relasjon {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr "Løs medlemskonflikter i relasjon {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr "Fjern relasjonsmedlem {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr "Roter {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Sekvens"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "Løs {0} egenskapskonflikter i {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr "Gjenopprett {0} objekter"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "Løs versjonskonflikter for {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr "Løs nodekonflikter i vei {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr "Hoveddatasettet inneholder ikke node {0}"
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Gjennomføre?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"Når du snur reningen på denne linjen blir følgende egenskaper endret for å "
-"opprettholde dataintegritet."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "Relasjon"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "Tidligere rolle"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "Ny rolle"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Tidligere nøkkel"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Tidligere verdi"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Ny nøkkel"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "Ny verdi"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "Bruk valgte endringer"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "Ikke bruk endringer"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "Velg hvilke endringer som skal brukes."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "Egenskaper for "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr "Roller i relasjoner som viser til"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "Korriger egenskap automatisk"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Innstillingsfil har feil i linje {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Kan ikke åpne innstillingsmappe: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr "Feil i innstillingsfila. Lagrer sikkerhetskopi i {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Innstillinger lagret i {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Kunne ikke laste opp innstillinger. Årsak: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "Klarte ikke lese innstillinger fra tjener."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr "allerede registrert en konflikt for primitiv \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "Desimalgrader"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "Grader, minutter, sekunder"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "V"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "Ø"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "parameter {0} > 0 nødvendig. Leste {1}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "uferdig"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2941,5 +2828,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2972,5 +2859,5 @@
 msgstr "parameter «{0}» er ikke en tillatt klasse – leste «{1}»"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -2979,22 +2866,22 @@
 msgstr[1] "{0} medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "ferdselsvei"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "jernbane"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "vannvei"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "bruk av grunn"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -3059,10 +2946,12 @@
 msgstr "multipolygon-linje «{0}» er ikke lukket."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "Tomt medlem i relasjon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3070,5 +2959,5 @@
 msgstr "Slettet medlem «{0}» i relasjon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3076,57 +2965,57 @@
 msgstr "Linje «{0}» med færre enn to punkter."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr "Fant mer enn én linje med «from»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr "Fant mer enn én linje med «to»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr "Fant mer enn én \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Ukjent rolle «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Ukjent medlemstype for «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr "Fant ingen linje med «from»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr "Fant ingen linje med «to»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr "Fant ingen node eller linje med «via»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3178,5 +3067,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3213,4 +3102,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3250,13 +3143,25 @@
 msgstr "UTM Sone {0}"
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "Kan ikke lese bokmerke."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "Kan ikke lagre bokmerke."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3293,4 +3198,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3322,15 +3228,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "En uventet unntakstilstand"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
 msgstr ""
-"Kunne ikke koble til OSM-tjeneren. Kontroller internett-tilkoblingen din."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3339,5 +3243,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -3345,6 +3249,4 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-"Klarte ikke starte kommunikasjonen med OSM-tjener {0}.\n"
-"Sjekk tjeneradressen i innstillingene og at internett-tilkoblingen virker."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
@@ -3368,7 +3270,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: failed to bring extended dialog always on top. Exception: {0}"
-msgstr "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65
@@ -3564,6 +3466,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3592,39 +3494,39 @@
 msgstr "Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "Flytt til høyre"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Kart: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "Flytt til venstre"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Flytt opp"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Flytt ned"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "Forstørr"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Forminsk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "målestokk"
@@ -3658,10 +3560,10 @@
 msgstr "(intet objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "Laget er ikke i lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3744,12 +3646,12 @@
 msgstr "rolle {0} deltar ikke i sammenlikningspar {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3758,6 +3660,6 @@
 msgstr "Egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3765,30 +3667,30 @@
 msgstr "Noder"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "Ingen gjenværende egenskapskonflikter å løse"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Egenskaper ({0} konflikter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} gjenværende egenskapskonflikter å løse"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Noder (løst)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
@@ -3797,17 +3699,17 @@
 "linjas nodeliste."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Noder (med konflikter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "Gjenværende konflikter i denne veiens nodeliste"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Medlemmer (løst)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3817,25 +3719,25 @@
 "denne relasjonens medlemsliste."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Medlemmer (med konflikter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Gjenværende konflikter i denne relasjonens medlemsliste"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr "Ingen gjenværende egenskapskonflikter"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Egenskaper (med konflikter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr "Gjenværende egenskapskonflikter å løse"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Konfliktløsning"
@@ -4057,8 +3959,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4292,5 +4194,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4303,5 +4205,5 @@
 msgstr "Objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 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."
@@ -4336,6 +4238,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4348,6 +4250,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4418,7 +4320,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4481,7 +4383,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Fortsett uansett"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4490,5 +4391,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>You didn''t finish to merge the differences in this conflict."
@@ -4498,8 +4399,4 @@
 "<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210
@@ -4512,7 +4409,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Løs versjonskonflikter for {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4562,99 +4459,92 @@
 msgstr "Vis historikken for det valgte objektet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Liste over alle innleste lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Slett valgt Lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "Noen endringer er ikke lagret. Slett allikevel?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "Slett Lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "Vil du virkelig slette hele laget?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Informasjon"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "ja"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Slett"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "Slett {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Vis/Skjul"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Slå av/på visning av Lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "privat"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "Slett valgt Lag."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "Sammenføy laget under med dette."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Flytt laget en rad opp."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Flytt laget en rad ned."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "Informasjonstavle"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4663,22 +4553,22 @@
 msgstr[1] "Dette vil endre opptil {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "Nøkkelen blir ikke lagret når den er tom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<different>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Endre verdier?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4686,5 +4576,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4693,49 +4583,40 @@
 msgstr[1] "Endre egenskap på inntil {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Velg en nøkkel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Velg en verdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 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/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "Egenskaper/medlemsskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Egenskaper for valgte objekt."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "Medlem av"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "Skift relasjon"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "Vil du slette utvalget fra relasjon {0}?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "Tilføy egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4752,63 +4633,77 @@
 msgstr "Legg til"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 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/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "Endre Oppsett"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 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/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Egenskaper: {0} / Medlemskap: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "Egenskaper / Medlemskap"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "Skift relasjon"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "Vil du slette utvalget fra relasjon {0}?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "Fjern den valgte nøkkel i alle objekt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "DSlett egenskaper"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "Fjern den valgte nøkkel i alle objekt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Egenskaper: {0} / Medlemskap: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "Egenskaper / Medlemskap"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Relasjoner"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "Åpne en liste over alle relasjoner"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relasjoner: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Åpne en editor for den valgte relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Slet valgt relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Oprett ny relasjon"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4839,5 +4734,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4905,31 +4800,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
-#, fuzzy
 msgid "Download all child relations (recursively)"
-msgstr "Last ned medlemer av relasjon"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "Last ned område"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "Slet valgt relasjon"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Last ned synlige kartbilder"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr "Last ned medlemer av relasjon"
@@ -4948,17 +4839,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "Ingen relasjoner er valgt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "Laster ned programtillegg {0} …"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -4976,7 +4866,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "Relasjoner"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -4987,9 +4876,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -4998,15 +4887,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "Fjernede Element fra Relasjoner"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -5016,9 +4904,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -5028,15 +4916,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5044,5 +4932,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5050,66 +4938,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
+msgid "Remove all members referring to one of the selected primitives"
+msgstr ""
+
+#. putValue(NAME, tr("Remove Selected"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Relation Editor: Remove Selected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #, fuzzy
-msgid "Remove all members referring to one of the selected primitives"
-msgstr "Klarte ikke oppdatere valgte objekter."
-
-#. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
-msgid "Relation Editor: Remove Selected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Select primitives for selected relation members"
+msgstr "Slet valgt relasjon"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "Flytt valgte medlem opp"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "Flytt valgt medlem ned"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Fjern alle valgte objekt fra relasjon"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "Slet valgt relasjon"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr "Fortsett å løse"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5118,10 +5020,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "Konflikter i data"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -5130,21 +5031,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Lagre gjeldende data."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5154,37 +5054,37 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Last ned alle ufullstendige linjer og noder i relasjonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "Last ned medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5194,32 +5094,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
-msgstr "Ja, rydd ut objektet"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
-msgstr "Bekreft Remote Control handlinger"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Zoom ut"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "Flytt valgt medlem ned"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5280,12 +5172,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "Les inn utvalg"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy
 msgid "Warning: ignoring exception because task was cancelled. Exception was: "
-msgstr "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70
@@ -5315,7 +5205,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "Bytt område"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6454,5 +6343,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Geotaggede bilder"
@@ -6478,5 +6367,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6495,5 +6384,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG-bilder (*.jpg)"
@@ -6531,43 +6420,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "gps-punkt"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Tilpass linjetegning"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Bruk globale indstillinger."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Tegn linjer mellem punkter i dette laget."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Tegn ikke linjer mellem punkt i dette laget."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Velg linjetegnings-innstillinger"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Tilpass farge"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6575,6 +6464,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6648,10 +6537,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Konverter til datalag"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6662,11 +6551,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6675,29 +6564,29 @@
 msgstr "Konvertert fra: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr "Last ned fra OSM langs dette spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "Last ned alt innenfor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "Max areal per forespørsel:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6708,9 +6597,9 @@
 "Ønsker du<br>å fortsette?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 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:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6720,5 +6609,5 @@
 "ble utelatt eller flyttet til start."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6770,5 +6659,5 @@
 msgstr "Konvertér til GPX-lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6793,5 +6682,5 @@
 msgstr[1] "GPS spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6799,5 +6688,5 @@
 msgstr[1] "punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6806,5 +6695,5 @@
 msgstr[1] "et GPS spor med {0} punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6813,5 +6702,5 @@
 msgstr[1] "{0} består av {1} GPS spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6820,9 +6709,9 @@
 msgstr[1] "{0} punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "GPS-flagg"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6830,5 +6719,5 @@
 msgstr[1] "flagg"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6837,14 +6726,14 @@
 msgstr[1] "{0} består av {1} flagg"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "Synkroniser lyd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 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:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6852,14 +6741,14 @@
 msgstr "Lyd synkronisert i punkt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 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:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 msgid "Make Audio Marker at Play Head"
 msgstr "Sett audio-merke ved avspilnings-start"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6867,13 +6756,13 @@
 msgstr "Du må  pause lyden på det punkt på sporet, hvor du vil ha merket."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 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:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Vis/skjul tekst/ikoner"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Slå av/på visning av tekst/ikoner"
@@ -7503,7 +7392,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
-#, fuzzy
 msgid "JOSM Plugin description URL"
-msgstr "Legg til URL for liste over programtillegg."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
@@ -7921,7 +7809,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -7993,4 +7881,9 @@
 msgstr "Klargjør data …"
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "Klarte ikke lese «{0}»"
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -8002,7 +7895,69 @@
 msgstr "Klarte ikke lese «{0}»"
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Merk: GPL er ikke kompatibel med OSM-lisensen. Ikke last opp GPL-lisensierte "
+"spor."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "GPX filer"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "beskrivelse av sporloggen"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Legg til informasjon om opphavsperson"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Fullt navn"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr "E-post"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Opphavsrett (URL)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Forhåndsvalgt"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "År for opphavsrett"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Stikkord"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Innstillinger for eksport"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "Eksporter og lagre"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Det oppsto feil i eksport av {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Velg en lisens"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -8030,4 +7985,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Lesefeil: Strukturen i GPX fila er ukjent"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Ukjent rolle «{0}»."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8164,7 +8124,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "Scanner mappa {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8179,4 +8139,5 @@
 msgstr "Tjeneren svarte en feil med kode {0}"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8208,4 +8169,32 @@
 msgstr "Logg inn"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "OSM-tjenerfiler"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8272,30 +8261,26 @@
 msgstr "Feil ved innlesing."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "OSM-tjenerfiler"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Ukjent versjon"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr "Versjon nummer mangler i OSM data"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr "Ukjent versjon: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr "Fant <nd> element i ikke_linje."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "<nd> har zero ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "Fandt <member>-element i en ikke-relation."
@@ -8347,5 +8332,5 @@
 msgstr "Mangler obligatorisk attributt «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8354,9 +8339,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "Ukjent medlemstype for «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "Klargjør OSM-data …"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "Feil id for node"
@@ -8480,9 +8470,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "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."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8573,7 +8561,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "Fant ikke info om programtillegg."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8967,23 +8954,23 @@
 msgstr "Fant tom fil i mappa {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Feil ved lesing av fil i mappa {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr "Juster til GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} hadde gps posisjon."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "Åpne bilder med AgPifoJ …"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9233,5 +9220,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Feil ved lasting av fil"
@@ -9280,30 +9267,13 @@
 msgstr "Velg Tableau d'Assemblage"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr "Matrikkel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr "Auto sourcing"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr "Ugyldig kartprojeksjon"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr "Bytt til kartprojeksjonen {0}."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-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"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9316,9 +9286,9 @@
 "Vil du gjenopprette bruken av F11 til å laste ned bilder?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr "Gjenopprett F11-hurtigtast"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM avsluttes for at endringen skal tre i kraft."
@@ -9491,13 +9461,23 @@
 msgstr "Hent bygningers avtrykk på bakken"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr "Last ned bilder fra fransk Cadastre WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Fransk Cadastre: {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+#, fuzzy
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
+msgstr ""
+"For å aktivisere Cadastre WMS plugin (Fransk matrikkel)\n"
+"Bytt kartprojeksjon til Lambert og restart JOSM"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9566,5 +9546,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr "Tilpass WMS"
@@ -10292,22 +10272,27 @@
 msgstr "Kunne ikke hente bilde"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr "Kobler opp"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr "Tilkoblet"
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr "Ikke Tilkoblet"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr "Tilkobling mislykkes"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "navn"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10340,32 +10325,32 @@
 msgstr "LiveGPS-lag"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
 msgstr "Lagre GPS spor"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr "Koble til gpsd-tjener og vis nåværende posisjon i LiveGPS-lag"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center Once"
 msgstr "Sentrer GPS nå"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center the LiveGPS layer to current position."
 msgstr "Sentrer LiveGPS-laget til nåværende position."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr "Auto-sentrer"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Sentrer LiveGPS-laget løpende til den nåværende posisjon."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -10614,24 +10599,24 @@
 msgstr "Tillatte handlinger"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Remote Control er bedt om å laste data fra API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr "Be om detaljer: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr "Vil du tillate dette?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr "Bekreft Remote Control handlinger"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Remote Control har bedt om data fra denne URL:"
@@ -10872,10 +10857,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
+#, fuzzy, java-format
+msgid "{0} start"
 msgstr "start"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr "avslutt"
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} node"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11411,10 +11398,10 @@
 msgstr "Kryssende veier"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr "Dobbelt-Noder"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Denne testen sjekker at det ikke er flere Noder med samme posisjon."
@@ -12102,9 +12089,32 @@
 msgstr "Ingen gyldig WMS-URL eller ID"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr "Tilpass posisjon på valgt  WMS lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "Velg raden som skal endres"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "Lagre WMS-lag"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+msgid "Start adjusting"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "Ingen endringer å laste opp."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -12119,57 +12129,57 @@
 msgstr "Automatisk nedlasting"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS lag ({0}) laster automatisk ned i zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS lag ({0})  laster ned i zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr "Du har bestilt for stort område. Zoom inn eller bytt oppløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Last ned synlige kartbilder"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Bytt oppløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Last ned kartbilder med feil på nytt"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Lagre WMS lag til fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr "Lagre WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "les inn WMS lag fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr "Last inn WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Støtter ikke WMS fil versjon;fant {0}, ønsker {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Feil Fil Format"
@@ -12790,5 +12800,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -15345,5 +15355,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15645,5 +15655,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15746,5 +15756,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -20370,7 +20380,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "Motorsykkel"
+msgstr ""
 
 #. color tertiary
@@ -23549,5 +23558,5 @@
 msgstr "Sted/by"
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23558,5 +23567,5 @@
 msgstr "Enveiskjøring"
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23566,5 +23575,5 @@
 msgstr "Kirke"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23575,5 +23584,5 @@
 msgstr "Bensinstasjon"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23584,5 +23593,5 @@
 msgstr "Handleområde"
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23592,5 +23601,5 @@
 msgstr "WC"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23823,46 +23832,18 @@
 msgstr "Terraserver Urban"
 
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Klarte ikke starte API. Prøv igjen senere."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Klarte ikke starte API"
-
-#~ 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?"
-
-#~ msgid "No data"
-#~ msgstr "Ingen data"
-
-#~ msgid "Update failed"
-#~ msgstr "Oppdatering feilet"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Mangler objekt"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Bruk ufullstendige løsninger"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Lag: {0}"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Fjern medlemmet i aktiv tabelrekke fra denne relasjonen"
-
-#~ 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 "Validate"
-#~ msgstr "Valider"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Valider enten aktivt utvalg eller hele datasett."
+#~ msgid "Unknown file extension."
+#~ msgstr "Ukjent filtype."
+
+#~ msgid "Move"
+#~ msgstr "Flytt"
+
+#~ msgid "Invalid projection"
+#~ msgstr "Ugyldig kartprojeksjon"
+
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Bytt til kartprojeksjonen {0}."
+
+#~ msgid "end"
+#~ msgstr "avslutt"
 
 #~ msgid "Some of the nodes are (almost) in the line"
@@ -23892,4 +23873,10 @@
 
 #~ 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?"
+
+#~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
@@ -23965,4 +23952,7 @@
 #~ msgstr "Ikke implementert enda."
 
+#~ msgid "Layers: {0}"
+#~ msgstr "Lag: {0}"
+
 #~ msgid "Tags (empty value deletes tag)"
 #~ msgstr "Egenskaper (tom verdi fjerner egenskap)"
@@ -23994,4 +23984,7 @@
 #~ 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 ""
@@ -24063,4 +24056,11 @@
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Kunne ikke laste programtillegg: {0} fra {1}"
+
+#~ 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 "Plugin already exists"
@@ -24107,4 +24107,10 @@
 #~ msgid "No intersections found. Nothing was changed."
 #~ msgstr "Ingen skjæringspunkt funnet. Ingen endringer utført."
+
+#~ msgid "Validate"
+#~ msgstr "Valider"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Valider enten aktivt utvalg eller hele datasett."
 
 #~ msgid "Metacarta Map Rectifier image id"
@@ -24202,4 +24208,7 @@
 #~ msgstr "% av lengden:"
 
+#~ msgid "Update failed"
+#~ msgstr "Oppdatering feilet"
+
 #~ msgid "Data Layer"
 #~ msgstr "Datalag"
@@ -24207,4 +24216,13 @@
 #~ msgid "Contacting the OSM server..."
 #~ msgstr "Kontakter OSM-tjeneren …"
+
+#~ msgid "Failed to initialize API. Please try again later."
+#~ msgstr "Klarte ikke starte API. Prøv igjen senere."
+
+#~ msgid "API initialization failed"
+#~ msgstr "Klarte ikke starte API"
+
+#~ msgid "Missing primitive"
+#~ msgstr "Mangler objekt"
 
 #~ msgid "image loading..."
@@ -24273,4 +24291,7 @@
 #~ "Ikke last opp data etter  denne meldingen."
 
+#~ msgid "Apply partial resolutions"
+#~ msgstr "Bruk ufullstendige løsninger"
+
 #~ msgid "Layer {0} must be in list of layers"
 #~ msgstr "Lag {0} må være i listen over lag"
@@ -24281,2 +24302,5 @@
 #~ msgid "Sort the selected relation members or the whole list"
 #~ msgstr "Sorter valgte relasjonsmedlemmer eller hele listen."
+
+#~ msgid "No data"
+#~ msgstr "Ingen data"
Index: /applications/editors/josm/i18n/po/nl.po
===================================================================
--- /applications/editors/josm/i18n/po/nl.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/nl.po	(revision 16973)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-07-28 07:35+0000\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-04 10:38+0000\n"
 "Last-Translator: Valentijn Sessink <valentijn@sessink.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -16,13 +16,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:35+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -47,15 +40,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -80,7 +65,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -88,4 +73,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -107,8 +96,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Fout"
@@ -121,5 +112,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Niet-opgeslagen wijzigingen"
@@ -140,16 +131,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -161,13 +151,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -184,4 +175,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "Annuleren"
@@ -195,5 +187,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -202,5 +194,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -211,23 +204,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -248,5 +241,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Waarschuwing"
@@ -280,5 +273,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -311,5 +304,5 @@
 msgstr "Probleem melden"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -370,19 +363,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Selecteer een rij om te verwijderen."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Selecteer één van beide:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "Knopen samenvoegen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -421,5 +411,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -452,18 +442,18 @@
 msgstr "Lengtegraad"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Knopen uitlijnen in een cirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "De geselecteerde knopen in een cirkel plaatsen."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -492,18 +482,18 @@
 msgstr "Gereedschap: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Selecteer minstens vier knopen."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -516,5 +506,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -641,13 +631,13 @@
 msgstr "Verschillende wegen combineren tot één weg."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Selecteer twee of meer wegen om te combineren."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "Wegen combineren ondanks verschillende relaties?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -657,13 +647,13 @@
 "u zeker dat u ze wilt combineren?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "Toch combineren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Richting omkeren?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -673,9 +663,9 @@
 "de richting van enkele omkeren?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Omkeren en combineren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -684,5 +674,5 @@
 msgstr "Waarden voor alle conflicten invoeren."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -690,14 +680,14 @@
 msgstr "Conflicten oplossen"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0} wegen combineren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "Alle wegen zijn leeg"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -716,24 +706,23 @@
 msgstr "Geselecteerde objecten naar klembord kopiëren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Selecteer iets om te kopiëren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Cirkel aanmaken"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Een cirkel uit drie knopen maken."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "Deze knopen staan niet in een cirkel."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -747,8 +736,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -768,15 +757,15 @@
 msgstr "Geselecteerde objecten verwijderen."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Overschrijven?"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "Bestand bestaat al. Overschrijven?"
@@ -837,5 +826,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -845,7 +834,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "Fouten tijdens download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -856,5 +844,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Dupliceren"
@@ -878,92 +867,36 @@
 msgstr "De applicatie afsluiten."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Let op: GPL is niet verenigbaar met de OSM licentie. Upload geen bestanden "
-"met een GPL-licentie."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Exporteren naar GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "De gegevens naar een GPX-bestand exporteren."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Geen gegevens om te exporteren, maak deze eerst."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr "Parameter \"{0}\" mag niet leeg zijn."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "GPS-trackomschrijving"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Voeg auteursinformatie toe"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Echte naam"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr "E-mail"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Copyright (URL)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Voorgedefinieerd"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "Jaar van copyright"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Trefwoorden"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Exporteeropties"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "Exporteren en opslaan"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Fout tijdens exporteren van {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Kies een voorgedefineerde licentie"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "De gegevens naar een GPX-bestand exporteren."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -979,6 +912,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1049,5 +982,5 @@
 msgstr "Koppel een knoop met het dichtstbijzijnde wegsegment"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "Knoop en lijn koppelen"
@@ -1058,12 +991,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Toch samenvoegen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "De laag hier direct onder samenvoegen bij de geselecteerde laag."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1109,12 +1040,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "selectie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "De geselecteerde leden omlaag verplaatsen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1174,5 +1103,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "Nieuw"
@@ -1247,5 +1176,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
-#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1253,7 +1181,4 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 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?"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1267,5 +1192,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Plakken"
@@ -1277,5 +1202,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Tags plakken"
@@ -1322,7 +1247,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Kan het bestand \"{0}\" niet hernoemen."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1359,5 +1284,10 @@
 msgstr "Het bestand {0} bestaat al. Overschrijven?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "Geen doorsnijdingen gevolgende. Er is niets veranderd."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1367,25 +1297,25 @@
 "dit als fout a.u.b."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "Geen document geopend, dus ook niets om op te slaan."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Leeg document"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "Het document bevat geen gegevens."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "Toch opslaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Conflicten"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1395,57 +1325,19 @@
 "niet opgeslagen en worden behandeld alsof je ze genegeerd hebt. Doorgaan?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "Conflicten verwerpen en opslaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "OSM-bestand opslaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "GPX-bestand opslaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "Laag opslaan"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Kan van bestand geen backup maken."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Onbekende bestandsextentie: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr "Het opslaan is mislukt."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr "Het herstellen van backupbestand is mislukt."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Onbekende bestandsextentie."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "Het opslaan is mislukt."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr "Het herstellen van backupbestand is mislukt."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1560,24 +1452,17 @@
 "selecteer knopen in het midden van de weg.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
 "should verify this and correct it when necessary.</html>"
 msgstr ""
-"Een lidmaatschapsrelatie gebaseerd op een rol is gekopieerd naar alle nieuwe "
-"wegen.\n"
-"Je moet dit controleren en waar nodig corrigeren."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
-#, fuzzy
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
 "this and correct it when necessary.</html>"
 msgstr ""
-"Een relatielidmaatschap is naar alle wegen gekopieerd.\n"
-"Verifieer dit, en maak aanpassingen als dat nodig is."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1721,7 +1606,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
-#, fuzzy
 msgid "No current dataset found"
-msgstr "Geen GPX-gegevenslaag gevonden."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
@@ -1834,7 +1718,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "Upload alle aanpassingen naar de OSM-server."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1992,12 +1875,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "Gegevens uploaden"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr "Tijdens bulkdownload traden de volgende fouten op:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -2037,5 +1919,5 @@
 msgstr "Modus: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2045,6 +1927,6 @@
 "behouden bij verwijderen van een weg. CTRL: verwijzende objecten verwijderen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2055,8 +1937,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2101,38 +1983,38 @@
 msgstr "geselecteerd"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "Kan geen knoop buiten de wereld toevoegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Knoop toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Knoop in weg toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "Bestaande weg aan knoop koppelen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Een nieuwe knoop aan een bestaande weg toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "Knoop in weg voegen en verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "Nieuwe node maken."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "Selecteer de node onder de cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2141,14 +2023,14 @@
 msgstr[1] "Nieuwe nodes toevoegen aan {0} wegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "Start een nieuwe weg vanaf de node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "Weg voortzetten vanaf laatste knoop."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "Tekenen beëindigen"
@@ -2168,5 +2050,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "De muisknop loslaten om objecten in het rechthoek te selecteren."
@@ -2179,5 +2061,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "De muisknop loslaten om het roteren te stoppen."
@@ -2214,9 +2096,9 @@
 msgstr[1] "Een virtuele knoop toevoegen en naar {0} wegen verplaatsen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2226,13 +2108,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2241,5 +2123,5 @@
 "met dichtstbijzijnde knoop."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2464,26 +2346,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr "Ontbrekende argumenten voor OR."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr "Ontbrekend argument voor NOT."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "Sluithaak verwacht."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2492,5 +2374,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2580,8 +2462,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Conflict oplossen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2593,10 +2474,10 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "Geen overeenkomst gevonden voor ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2640,5 +2521,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "Uit relatie verwijderen"
@@ -2653,5 +2534,5 @@
 "Verwijder van relatie?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr "Wegsegment splitsen"
@@ -2659,5 +2540,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2669,8 +2551,7 @@
 "niet ziet) ze kunnen gebruiken.<br>Wil je ze echt verwijderen?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "Uit relatie verwijderen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2680,9 +2561,224 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Verplaatsen"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "{0} knopen samenvoegen"
+msgstr[1] "{0} knopen samenvoegen"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "{0} knoop"
+msgstr[1] "{0} knopen"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Volgorde"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "Los {0} tag-conflicten op in {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr "Versieconflicten voor {0} {1} oplossen"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Toepassen?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"Bij het omkeren van de rijrichting worden de volgende veranderingen van "
+"eigenschappen van de weg en zijn knopen voorgesteld om de gegevens "
+"consistent te houden."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Relatie"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Oude rol"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "Nieuwe rol"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Oude sleutel"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Oude waarde"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Nieuwe sleutel"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "Nieuwe waarde"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Geselecteerde wijzigingen toepassen"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Wijzigingen niet toepassen"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "Selecteer welke wijzigingen in eigenschappen je wilt toepassen."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Eigenschappen van "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr "Rollen in relaties verwijzen naar"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Automatische tagcorrectie"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Configuratiebestand is verminkt in regels {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Kan voorkeurenmap niet openen: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr "Voorkeurenbestand bevat fouten. Backup maken van de oude naar {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Voorkeuren opgeslagen op {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Kan geen voorkeuren uploaden. Reden: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "Kan geen voorkeuren van server laden."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "Decimale graden"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "Graden minuten seconden"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "Z"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "W"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "O"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "{0} object wijzigen"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "onvolledig"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2696,211 +2792,4 @@
 msgstr[1] "knopen"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Volgorde"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "Los {0} tag-conflicten op in {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "Versieconflicten voor {0} {1} oplossen"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Toepassen?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"Bij het omkeren van de rijrichting worden de volgende veranderingen van "
-"eigenschappen van de weg en zijn knopen voorgesteld om de gegevens "
-"consistent te houden."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "Relatie"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "Oude rol"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "Nieuwe rol"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Oude sleutel"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Oude waarde"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Nieuwe sleutel"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "Nieuwe waarde"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "Geselecteerde wijzigingen toepassen"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "Wijzigingen niet toepassen"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "Selecteer welke wijzigingen in eigenschappen je wilt toepassen."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "Eigenschappen van "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr "Rollen in relaties verwijzen naar"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "Automatische tagcorrectie"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Configuratiebestand is verminkt in regels {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Kan voorkeurenmap niet openen: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr "Voorkeurenbestand bevat fouten. Backup maken van de oude naar {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Voorkeuren opgeslagen op {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Kan geen voorkeuren uploaden. Reden: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "Kan geen voorkeuren van server laden."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "Decimale graden"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "Graden minuten seconden"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "Z"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "W"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "O"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "onvolledig"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2932,5 +2821,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2963,5 +2852,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -2970,22 +2859,22 @@
 msgstr[1] "{0} leden"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "snelweg"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "spoorweg"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "waterweg"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "grondgebruik"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -3050,10 +2939,12 @@
 msgstr "Multipolygone weg \"{0}\" is niet gesloten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "Relatie bevat leeg lid."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3061,5 +2952,5 @@
 msgstr "Lid \"{0}\" in relatie wissen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3067,57 +2958,57 @@
 msgstr "Weg \"{0}\" met minder dan twee punten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr "Meer dan een \"van\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr "Meer dan een \"naar\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr "Meer dan éé \"via\" gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Onbekende rol \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Onbekend lidtype voor \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr "Geen \"van\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr "Geen \"naar\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr "Geen \"via\"-knoop of -weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 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/"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3169,5 +3060,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3201,4 +3092,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3239,13 +3134,25 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "Kon bladwijzers niet lezen."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "Kan bladwijzer niet schrijven."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3278,4 +3185,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3307,15 +3215,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "Er is een onverwachte fout opgetreden"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
 msgstr ""
-"Kan niet met de OSM-server verbinden. Controleer je internetverbinding."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3548,6 +3454,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3576,39 +3482,39 @@
 msgstr "Geluid"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "Naar rechts verplaatsen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Kaart: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "Naar links verplaatsen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Omhoog verplaatsen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Omlaag verplaatsen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "Inzoomen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Uitzoomen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "schalen"
@@ -3642,10 +3548,10 @@
 msgstr "(geen object)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "laag niet in lijst."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3730,12 +3636,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3744,6 +3650,6 @@
 msgstr "Tags"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3751,47 +3657,47 @@
 msgstr "Knopen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Leden"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "Geen tag-conflicten om op te lossen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Tags ({0} conflicten)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} tag-conflicten om op te lossen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Knopen (opgelost)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Knopen (met conflicten)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "Conflicten in de knopen van deze weg"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Leden (opgelost)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3799,25 +3705,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Leden (met conflicten)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
@@ -4017,8 +3923,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4237,5 +4143,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4248,5 +4154,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4281,6 +4187,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4293,6 +4199,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4363,7 +4269,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4430,7 +4336,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Toch doorgaan"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4457,7 +4362,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Versieconflicten voor {0} {1} oplossen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4506,99 +4411,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Lagen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Een lijst met alle geladen lagen openen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "De geselecteerde laag verwijderen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "Wijzigingen zijn niet opgeslagen. De laag toch verwijderen?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "Laag verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "Wil je de hele laag zeker verwijderen?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Informatie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "ja"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Verwijderen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "{0} {1} verwijderen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Tonen/Verbergen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Zichtbaarheid van een laag in- of uitschakelen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "privé"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "De geselecteerde laag verwijderen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "De laag hier direct onder samenvoegen bij de geselecteerde laag."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "De geselecteerde laag een rij omhoog verplaatsen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "De geselecteerde laag een rij omlaag verplaatsen."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "Meer informatie over deze functionaliteit"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4607,22 +4505,22 @@
 msgstr[1] "Dit verandert {0} objecten."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "Een lege waarde verwijdert de sleutel."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<verschillend>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Waarden aanpassen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4630,5 +4528,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4637,49 +4535,40 @@
 msgstr[1] "Eigenschappen van {0} objecten aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Selecteer een sleutel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Selecteer een waarde"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 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/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "Eigenschappen/Lidmaatschappen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Eigenschappen voor geselecteerde objecten."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "Lid van"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "Relatie wijzigen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "Selectie uit relatie {0} zeker verwijderen?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "Eigenschappen toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4696,63 +4585,77 @@
 msgstr "Toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 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/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "Eigenschappen bewerken"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 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/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Eigenschappen: {0} / Leden: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "Eigenschappen / Leden"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "Relatie wijzigen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "Selectie uit relatie {0} zeker verwijderen?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "De geselecteerde sleutel in alle objecten verwijderen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "Eigenschappen verwijderen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "De geselecteerde sleutel in alle objecten verwijderen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Eigenschappen: {0} / Leden: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "Eigenschappen / Leden"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Relaties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "Een lijst met alle relaties openen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaties: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Een editor voor de geselecteerde relatie openen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "De geselecteerde relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Een nieuwe relatie aanmaken"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4783,5 +4686,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4851,5 +4754,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -4860,21 +4763,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "Gebied downloaden"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "De geselecteerde relatie verwijderen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Zichtbare tegels downloaden"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr ""
@@ -4893,17 +4793,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "Relaties"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "{0} downloaden"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -4921,7 +4820,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "Relaties"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -4932,9 +4830,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -4943,15 +4841,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "De laatste ongedaan gemaakte opdracht herstellen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -4961,9 +4858,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -4973,15 +4870,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -4989,5 +4886,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -4995,66 +4892,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
+msgid "Remove all members referring to one of the selected primitives"
+msgstr ""
+
+#. putValue(NAME, tr("Remove Selected"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Relation Editor: Remove Selected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #, fuzzy
-msgid "Remove all members referring to one of the selected primitives"
-msgstr "Vernieuwen van de geselecteerde entiteit is niet gelukt."
-
-#. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
-msgid "Relation Editor: Remove Selected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Select primitives for selected relation members"
+msgstr "De geselecteerde relatie verwijderen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "De geselecteerde leden omhoog verplaatsen"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "De geselecteerde leden omlaag verplaatsen"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Alle nu geselecteerde objecten uit relatie verwijderen"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "De geselecteerde relatie verwijderen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr "Doorgaan met oplossen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5063,10 +4974,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "Tegenstrijdigheden in de gegevens"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -5075,21 +4985,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Huidige gegevens opslaan."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5099,37 +5008,37 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Alle incomplete wegen en daarbij behorende knopen downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "Leden downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5139,31 +5048,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
-msgstr "Remote-controlopdracht bevestigen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Uitzoomen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "De geselecteerde leden omlaag verplaatsen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5224,7 +5126,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "Selectie laden"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -5258,7 +5159,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "Locatie veranderen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6392,5 +6292,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Geotagged afbeeldingen"
@@ -6416,5 +6316,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6433,5 +6333,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG-afbeeldingen (*.jpg)"
@@ -6469,43 +6369,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "GPS-punt"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Lijntekening aanpassen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Algemene instellingen gebruiken."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Lijnen tussen punten in deze laag tekenen."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Geen lijnen tussen punten in deze laag tekenen."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Lijntekenopties selecteren"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Kleur aanpassen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6513,6 +6413,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6586,10 +6486,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Naar gegevenslaag omzetten"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6600,11 +6500,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6613,29 +6513,29 @@
 msgstr "Omgezet van: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr "Uit OSM langs deze track downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "Alles downloaden binnen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meters"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "Maximum oppervlak per verzoek:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6646,9 +6546,9 @@
 "verder<br>gaan?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 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:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6658,5 +6558,5 @@
 "de track zijn overgeslagen of naar de start verplaatst."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6708,5 +6608,5 @@
 msgstr "Naar GPX-laag omzetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6731,5 +6631,5 @@
 msgstr[1] "tracks"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6737,5 +6637,5 @@
 msgstr[1] "Punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6744,5 +6644,5 @@
 msgstr[1] "Een track met {0} punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6751,5 +6651,5 @@
 msgstr[1] "{0} bestaat uit {1} tracks"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6758,9 +6658,9 @@
 msgstr[1] "{0} punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "GPS-marker"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6768,5 +6668,5 @@
 msgstr[1] "markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6775,14 +6675,14 @@
 msgstr[1] "{0} bestaat uit {1} markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "Geluid synchroniseren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 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:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6790,14 +6690,14 @@
 msgstr "Geluid gesynchroniseerd op punt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 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:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 msgid "Make Audio Marker at Play Head"
 msgstr "Geluidsmarker op afspeelstart zetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6807,13 +6707,13 @@
 "marker wilt hebben."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 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:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Tekst/pictogrammen tonen/verbergen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Zichtbaarheid van de markertekst en pictogrammen in- of uitschakelen."
@@ -7871,7 +7771,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -7943,4 +7843,9 @@
 msgstr "Gegevens voorbereiden..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "Kan \"{0}\" niet lezen"
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -7952,7 +7857,69 @@
 msgstr "Kan \"{0}\" niet lezen"
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Let op: GPL is niet verenigbaar met de OSM licentie. Upload geen bestanden "
+"met een GPL-licentie."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "GPX-bestanden"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "GPS-trackomschrijving"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Voeg auteursinformatie toe"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Echte naam"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr "E-mail"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Copyright (URL)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Voorgedefinieerd"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "Jaar van copyright"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Trefwoorden"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Exporteeropties"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "Exporteren en opslaan"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Fout tijdens exporteren van {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Kies een voorgedefineerde licentie"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -7980,4 +7947,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Ontleedfout: documentstructuur van GPX-bestand is ongeldig"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Onbekende rol \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8110,7 +8082,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "Map {0} scannen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8125,4 +8097,5 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8154,4 +8127,32 @@
 msgstr "Login"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "OSM Server bestanden"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8209,30 +8210,26 @@
 msgstr "Fout tijdens ontleden."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "OSM Server bestanden"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Onbekende versie"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr "<nd>-element in niet-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "<nd> heeft geen referenties"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "<member>-element in niet-relatie gevonden."
@@ -8282,5 +8279,5 @@
 msgstr "Verplicht attribuut \"{0}\" ontbreekt."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8289,9 +8286,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "Onbekend lidtype voor \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "OSM-gegevens voorbereiden..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "Misvormde knoop-id"
@@ -8415,9 +8417,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
-"Waarschuwing - verzoek tot laden van {0}-plugin. Deze plugin is niet langer "
-"noodzakelijk."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8510,7 +8510,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "Geen plugin-informatie gevonden."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8898,23 +8897,23 @@
 msgstr "Leeg bestand in {0} gevonden\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Bestanden uit map {0} halen is mislukt\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr "Met GPX relateren"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} zijn getagd als GPS"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "Afbeeldingen openen met AGPifoJ..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9164,5 +9163,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Laden bestand is mislukt"
@@ -9211,30 +9210,13 @@
 msgstr "Tableau d'Assemblage selecteren"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr "Kadaster"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr "Automatisch vullen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr "Onjuiste projectie"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr "Verander eerste de projectie in {0}."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-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."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9243,9 +9225,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
@@ -9418,13 +9400,23 @@
 msgstr "Grondafdruk gebouw uitnemen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Cadastre: {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+#, fuzzy
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
+msgstr ""
+"Verander de JOSM-projectie en herstart om\n"
+"de kadaster-WMS-plugin in te schakelen."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9494,5 +9486,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr "WMS aanpassen"
@@ -10220,22 +10212,27 @@
 msgstr "Kan afbeelding niet ophalen"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr "Verbinden"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr "Verbonden"
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr "Niet verbonden"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr "Verbinding is mislukt"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "naam"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10268,32 +10265,32 @@
 msgstr "LiveGPS-laag"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
 msgstr "GPS-track omvatten"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr "Met gpsd-server verbinden en de huidige locatie in LiveGPS-laag tonen."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center Once"
 msgstr "Eenmalig centreren"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center the LiveGPS layer to current position."
 msgstr "De LiveGPS-laag op de huidige locatie centreren."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr "Automatisch centeren"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "De LiveGPS-laag continu op de huidige locatie centeren."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -10540,24 +10537,24 @@
 msgstr "Toegestane opdrachten"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Afstandsbediening is gevraagd gegevens uit de API te laden."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr "Gewenste details: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr "Wil je dit toestaan?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr "Remote-controlopdracht bevestigen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -10797,10 +10794,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
+#, fuzzy, java-format
+msgid "{0} start"
 msgstr "Begin"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr "einde"
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} knoop"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11341,10 +11340,10 @@
 msgstr "Kruisende wegen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr "Dubbele knopen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
@@ -12021,9 +12020,32 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr "De positie van de geselecteerde WMS-laag aanpassen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "Selecteer een rij om te bewerken."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "Laag verwijderen"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+msgid "Start adjusting"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "Geen aanpassingen aanwezig om te uploaden."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -12039,15 +12061,15 @@
 msgstr "Automatisch downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-laag ({0}), automatisch in zoom {1} downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-laag ({0}), in zoom {1} downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12055,42 +12077,42 @@
 "Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Zichtbare tegels downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Resolutie veranderen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Foutieve tegels herladen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "WMS-laag in bestand opslaan"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "WMS-laag uit bestand laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Niet-ondersteunde WMS-bestandsversie; is {0}, verwachtte {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Fout in bestandsindeling"
@@ -12677,5 +12699,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -15232,5 +15254,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15532,5 +15554,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15633,5 +15655,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -20257,7 +20279,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "Motorsport"
+msgstr ""
 
 #. color tertiary
@@ -23436,5 +23457,5 @@
 msgstr "Dorp/stad"
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23445,5 +23466,5 @@
 msgstr "Éénrichting"
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23453,5 +23474,5 @@
 msgstr "Kerk"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23462,5 +23483,5 @@
 msgstr "Tankstation"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23471,5 +23492,5 @@
 msgstr "Winkelen"
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23479,5 +23500,5 @@
 msgstr "WC"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23710,32 +23731,18 @@
 msgstr ""
 
-#~ 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 "No data"
-#~ msgstr "Geen gegevens"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Lagen: {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 ""
-#~ "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 "Validate"
-#~ msgstr "Valideren"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Valideer de huidige selectie of de totale gegevensset."
+#~ msgid "Unknown file extension."
+#~ msgstr "Onbekende bestandsextentie."
+
+#~ msgid "Move"
+#~ msgstr "Verplaatsen"
+
+#~ msgid "Invalid projection"
+#~ msgstr "Onjuiste projectie"
+
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Verander eerste de projectie in {0}."
+
+#~ msgid "end"
+#~ msgstr "einde"
 
 #~ msgid "Not implemented yet."
@@ -23799,4 +23806,7 @@
 #~ msgid "There were conflicts during import."
 #~ msgstr "Er zijn conflicten tijdens het importeren."
+
+#~ msgid "Remove the member in the current table row from this relation"
+#~ msgstr "De leden in de huidige tabelrij uit deze relatie verwijderen"
 
 #~ msgid "Date"
@@ -23976,7 +23986,16 @@
 #~ "indrukken en muis bewegen. Selecteer"
 
+#~ msgid "Validate"
+#~ msgstr "Valideren"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Valideer de huidige selectie of de totale gegevensset."
+
 #~ msgid "Open the OpenStreetBugs window and activate the automatic download"
 #~ msgstr ""
 #~ "Opent het OpenStreetBugs-scherm en activeert de automatische download"
+
+#~ msgid "Layers: {0}"
+#~ msgstr "Lagen: {0}"
 
 #~ msgid "Conflicts: {0}"
@@ -24008,4 +24027,11 @@
 #~ msgid "Portcullis"
 #~ msgstr "Valhek"
+
+#~ 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 "false"
@@ -24123,7 +24149,4 @@
 #~ "doorgaan?"
 
-#~ msgid "No intersections found. Nothing was changed."
-#~ msgstr "Geen doorsnijdingen gevolgende. Er is niets veranderd."
-
 #~ msgid ""
 #~ "An error occured while trying to match the photos to the GPX track. You "
@@ -24132,4 +24155,11 @@
 #~ "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 "Edit Drawbridge"
@@ -24156,2 +24186,5 @@
 #~ "een gegevensverzameling van Zwitserland of Liechtenstein.\n"
 #~ "Upload geen gegevens na dit bericht."
+
+#~ msgid "No data"
+#~ msgstr "Geen gegevens"
Index: /applications/editors/josm/i18n/po/pl.po
===================================================================
--- /applications/editors/josm/i18n/po/pl.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/pl.po	(revision 16973)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-07-31 07:14+0000\n"
-"Last-Translator: Paweł Madej <nysander@quanteam.pl>\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-07 13:28+0000\n"
+"Last-Translator: Łukasz Jernaś <deejay1@srem.org>\n"
 "Language-Team: Polish <josm-lang-pl@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,16 +17,9 @@
 "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: 2009-08-04 09:34+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Basepath: /home/mfloryan/dev/josm/i18n/\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -51,15 +44,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -84,7 +69,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -92,4 +77,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -111,8 +100,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Błąd"
@@ -124,5 +115,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Niezapisane zmiany"
@@ -142,16 +133,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -163,13 +153,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -186,4 +177,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "Anuluj"
@@ -197,5 +189,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -204,5 +196,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -213,23 +206,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -250,5 +243,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Uwaga"
@@ -282,5 +275,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -313,5 +306,5 @@
 msgstr "Raporty o błędach"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -374,19 +367,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Proszę wybrać wiersz do usunięcia"
+msgstr "Proszę, wybierz warstwę docelową."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Wybierz przynajmniej:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "Połącz węzły"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -399,5 +389,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 msgid "No target layers"
-msgstr ""
+msgstr "Brak warstw docelowych."
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
@@ -425,5 +415,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -456,18 +446,18 @@
 msgstr "Długość"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Wyrównaj węzły na kole"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Przesuwa wybrane węzły tak, aby tworzyły koło."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -496,18 +486,18 @@
 msgstr "Narzędzie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Wybierz co najmniej cztery węzły."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -520,5 +510,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -584,5 +574,5 @@
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
+msgstr "{0} węzłów w drodze {1} przekracza dopuszczalną liczbę węzłów {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
@@ -643,13 +633,13 @@
 msgstr "Łączy kilka dróg w jedną."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Wybierz co najmniej dwie drogi do połączenia."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "Czy połączyć drogi, które należą do różnych relacji?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -657,13 +647,13 @@
 msgstr "Wybrane drogi należą do różnych relacji. Czy nadal chcesz je połączyć?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "Połącz mimo tego"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Zmienić kierunek?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -673,9 +663,9 @@
 "zmienić kierunek niektórych dróg?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Odwróć i połącz"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -684,5 +674,5 @@
 msgstr "Podaj wartości dla wszystkich konfliktów."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -690,14 +680,14 @@
 msgstr "Rozwiąż konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Połącz {0} dróg"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "Wszystkie trasy są puste"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -716,24 +706,23 @@
 msgstr "Kopiuje zaznaczone obiekty do schowka."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Proszę wybrać coś do skopiowania."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Utwórz okrąg"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Tworzy okrąg na podstawie trzech zaznaczonych węzłów."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "Wybrane węzły nie tworzą okręgu."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -747,8 +736,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -768,15 +757,15 @@
 msgstr "Usuwa wybrane obiekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Zastąp"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "Plik istnieje. Nadpisać?"
@@ -839,15 +828,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
 #, java-format
 msgid "There were {0} conflicts during import."
-msgstr ""
+msgstr "Wystąpił/o {0} koflikt/ów podczas importu."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "Błędy podczas pobierania"
+msgstr "Konflikty podczas pobierania."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -858,5 +846,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Powiel"
@@ -880,92 +869,36 @@
 msgstr "Kończy pracę z programem."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Uwaga: Licencja GPL nie jest zgodna z licencją OSM. Proszę nie przesyłać "
-"tras na licencji GPL."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Eksportuj do GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Eksportuj dane do pliku GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Nie ma nic do wyeksportowania. Utwórz jakieś obiekty."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "Opis trasy GPS"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Dodaj informacje o autorze"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Imię i nazwisko"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Prawa autorskie (URL)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Predefiniowane"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "Prawa autorskie - rok"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Słowa kluczowe"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Opcje eksportu"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "Eksportuj i zapisz"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Błąd podczas eksportu {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Wybierz jedną z gotowych licencji"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "Eksportuj dane do pliku GPX"
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -981,6 +914,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1053,5 +986,5 @@
 msgstr "Łączy węzeł z najbliższym odcinkiem drogi"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "Połącz węzeł i linię"
@@ -1062,12 +995,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Scal mimo tego"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "Włącz warstwę bezpośrednio poniżej w wybraną warstwę."
+msgstr "Włącz  aktualną warstwę do innej."
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1111,12 +1042,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "zaznaczenie"
+msgstr "Połącz wybrane elementy."
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1176,5 +1105,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "Nowa"
@@ -1196,5 +1125,5 @@
 #, java-format
 msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
-msgstr ""
+msgstr "<html>Nie mogę czytać pliku ''{0}''. Komunikat błędu: <br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
@@ -1252,5 +1181,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
-#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1258,7 +1186,4 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 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ć?"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1272,5 +1197,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Wklej"
@@ -1282,5 +1207,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Wklej znaczniki"
@@ -1327,7 +1252,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Nie można zmienić nazwy pliku \"{0}\""
+msgstr "Nie mogłem przemianować pliku ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1364,5 +1289,10 @@
 msgstr "Plik {0} już istnieje. Nadpisać?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1372,25 +1302,25 @@
 "conditions for no layer\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Pusty dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "Dokument nie zawiera żadnych danych."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "Zapisz pomimo tego"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1400,57 +1330,19 @@
 "odrzucone. Czy kontunuować?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "Odrzuć konflikty i zapisz"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "Zapisz plik OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "Zapisz plik GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "Zapisz warstwę"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Nie można utworzyć kopii zapasowej pliku."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Nieznane rozszerzenie pliku: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr "Wystąpił błąd podczas zapisywania."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr "Wystąpił błąd podczas przywracania pliku kopii zapasowej."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Nieznane rozszerzenie pliku."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "Wystąpił błąd podczas zapisywania."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr "Wystąpił błąd podczas przywracania pliku kopii zapasowej."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1562,5 +1454,5 @@
 "węzły w środku drogi.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1568,5 +1460,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1574,5 +1466,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1733,5 +1625,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121
 msgid "Selection empty"
-msgstr ""
+msgstr "Wybrano zbiór pusty."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
@@ -1788,5 +1680,5 @@
 #, java-format
 msgid "unexpected return value. Got {0}"
-msgstr ""
+msgstr "niespodziewana wartość powrotna. Dostałem {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258
@@ -1823,7 +1715,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "Wysyła wszystkie zmiany na serwer OSM."
+msgstr "Załadunek wszystkich zmian w jednym żądaniu."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1981,12 +1872,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "Przesyłanie danych"
+msgstr "Odświeżanie danych"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr "Podczas pobierania wystąpiły następujące błędy:"
+msgstr "The following errors occurred during mass download:{0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -2026,5 +1916,5 @@
 msgstr "Tryb: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2034,6 +1924,6 @@
 "usuwaniu drogi. Ctrl: usuwa powiązane obiekty."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2044,8 +1934,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2068,5 +1958,5 @@
 #, java-format
 msgid "parameter ''{0}'' must not be null"
-msgstr ""
+msgstr "parameter ''{0}'' nie może być pusty (null)"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
@@ -2090,38 +1980,38 @@
 msgstr "zaznaczony"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "Nie można dodać węzła poza granicami świata."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Dodaj węzeł"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Dodaj węzeł do drogi"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "Połącz istniejący drogę z węzłem"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Dodaj nowy węzeł do istniejącej drogi"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "Dodaj węzeł do drogi i połącz"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "Utwórz nowy węzeł."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "Zaznacz węzeł pod kursorem."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2130,14 +2020,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "Zacznij nową drogę od ostatniego węzła"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "Kontynuuj drogę od ostatniego węzła."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "Zakończ rysowanie."
@@ -2157,5 +2047,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2166,5 +2056,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "Zwolnij przycisk myszy aby zakończyć obracanie."
@@ -2199,9 +2089,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr "Więcej elementów"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2210,14 +2100,18 @@
 "Really move them?"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+"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?"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+msgstr "Przesuń je"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+msgstr "Cofnij przesunięcie"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2226,5 +2120,5 @@
 "najbliższym węzłem."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2262,5 +2156,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
-msgstr ""
+msgstr "Nie mogę szukać ponieważ nie załadowano danych."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66
@@ -2442,26 +2336,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr "Brak argumentów dla operator lub."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr "Brak argumentu dla operatora nie."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "Brak nawiasu zamykającego."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2470,5 +2364,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2559,8 +2453,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Rozwiąż konflikt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2572,10 +2465,10 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "Nie znaleziono nic szukając ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2617,5 +2510,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "Usuń z relacji"
@@ -2628,5 +2521,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr "Rozdziel segmenty drogi"
@@ -2634,5 +2527,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2640,9 +2534,11 @@
 "use them.<br>Do you really want to delete?"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+"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ąć?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "Usuń z relacji"
+msgstr "Potwierdź usunięcie."
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2652,9 +2548,225 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Przenieś"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "Scal {0} węzłów"
+msgstr[1] "Scal {0} węzłów"
+msgstr[2] "Scal {0} węzłów"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "{0} węzeł"
+msgstr[1] "{0} węzły"
+msgstr[2] "{0} węzłów"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Sekwencja"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Zastosować?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"Podczas odwracania kierunku drogi następujące właściwości drogi oraz jej "
+"węzłów powinny zostać uwzględniony aby zachować spójność."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Relacja"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Poprzednia rola"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "Nowa rola"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Stary klucz"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Stara wartość"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Nowy klucz"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "Nowa wartość"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Zastosuj wybrane zmiany"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Porzuć zmiany"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "Wybierz, które właściwości chcesz zmienić."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Właściwości "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Automatyczna korekcja tagów"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Błąd w pliku konfiguracyjnym w linii {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Preferencje zostały zapisane na {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Wysłanie preferencji nie powiodło się. Powód: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "Pobranie preferencji z serwera nie powiodło się."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "Stopnie dziesiętne"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "Stopnie minuty sekundy"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "W"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "E"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "Zmień {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "niekompletne"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2669,210 +2781,4 @@
 msgstr[2] "węzłów"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Sekwencja"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Zastosować?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"Podczas odwracania kierunku drogi następujące właściwości drogi oraz jej "
-"węzłów powinny zostać uwzględniony aby zachować spójność."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "Relacja"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "Poprzednia rola"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "Nowa rola"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Stary klucz"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Stara wartość"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Nowy klucz"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "Nowa wartość"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "Zastosuj wybrane zmiany"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "Porzuć zmiany"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "Wybierz, które właściwości chcesz zmienić."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "Właściwości "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "Automatyczna korekcja tagów"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Błąd w pliku konfiguracyjnym w linii {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Preferencje zostały zapisane na {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Wysłanie preferencji nie powiodło się. Powód: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "Pobranie preferencji z serwera nie powiodło się."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "Stopnie dziesiętne"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "Stopnie minuty sekundy"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "W"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "E"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "niekompletne"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2905,5 +2811,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2937,5 +2843,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -2945,22 +2851,22 @@
 msgstr[2] "{0} elementów"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "droga"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "tory kolejowe"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "szlak wodny"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "zagospodarowanie przestrzenne"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -3026,10 +2932,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3037,5 +2945,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3043,57 +2951,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Nieznana rola \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3145,5 +3053,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3177,4 +3085,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3209,13 +3121,25 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "Odczytania zakładek niemożliwe."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "Zapisanie zakładek niemożliwe."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3248,4 +3172,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3277,16 +3202,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "Nieoczekiwany błąd"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
 msgstr ""
-"Nie można połączyć z serwerem OSM. Proszę sprawdzić swoje połączenie z "
-"Internetem."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3507,6 +3429,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3535,39 +3457,39 @@
 msgstr "Dźwięk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "Przesuń w prawo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Mapa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "Przesuń w lewo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Przesuń do góry"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Przesuń w dół"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "Powiększ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Zmniejsz"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "skala"
@@ -3601,10 +3523,10 @@
 msgstr "(brak obiektu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "warstwa nie jest na liście."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3686,12 +3608,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3700,6 +3622,6 @@
 msgstr "Etykiety"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3707,47 +3629,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Członkowie"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#, java-format
+msgid "{0} pending tag conflicts to be resolved"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
-#, java-format
-msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3755,25 +3677,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
@@ -3973,8 +3895,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4193,5 +4115,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4204,5 +4126,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4237,6 +4159,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4249,6 +4171,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4319,7 +4241,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4382,7 +4304,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Zapisz pomimo tego"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4409,7 +4330,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Rozwiąż konflikty"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4458,99 +4379,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Warstwy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Otwiera listę wszystkich wczytanych warstw."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Usuń zaznaczoną warstwę."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "Istnieją niezapisane zmiany. Czy usunąć tę warstwę mimo tego?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "Usuń warstwę"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "Na pewno usunąć całą warstwę?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Informacje"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "tak"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Usuń"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "Usuń {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Pokaż/Ukryj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Zmienia widocznoś zaznaczonej warstwy."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "droga prywatna"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "Usuń zaznaczoną warstwę."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "Włącz warstwę bezpośrednio poniżej w wybraną warstwę."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Przesuwa wybraną warstwę o jeden wiersz do góry."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Przesuwa wybraną warstwę o jedno odczo do dołu."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "Więcej informacji na temat tej funkcji"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4560,22 +4474,22 @@
 msgstr[2] "Ta operacja może zmienić {0} obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "Ustawienie wartości na pustą usuwa klucz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<różne>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Zmienić wartości?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4583,5 +4497,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4591,49 +4505,40 @@
 msgstr[2] "Zmiana właściwości {0} obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Proszę wybierz klucz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Proszę wybierz wartość"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Please select the objects you want to change properties for."
 msgstr "Zaznacz proszę te obiekty, których właściwości chcesz zmienić."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "Właściwości/członkostwo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Właściwości zaznaczonych obiektów."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "Członek"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "Zmień relację"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "Na pewno usunąć zaznaczenie z relacji {0}?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "Dodaj właściwości"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4650,63 +4555,77 @@
 msgstr "Dodaj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 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/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "Edycja właściwości"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 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/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Właściwości: {0} / członkostwo: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "Właściwości / członkostwo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "Zmień relację"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "Na pewno usunąć zaznaczenie z relacji {0}?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "Usuń wybrany klucz ze wszystkich obiektów."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "Usuń właściwość"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "Usuń wybrany klucz ze wszystkich obiektów."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Właściwości: {0} / członkostwo: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "Właściwości / członkostwo"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Relacje"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "Otwiera listę wszystkich relacji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relacje: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Otwiera okno edycji dla zaznaczonej relacji."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Usuwa zaznaczoną relację."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Utwórz nową relację"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4737,5 +4656,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4806,5 +4725,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -4815,21 +4734,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "Pobierany obszar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "Usuwa zaznaczoną relację."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Pobierz dane."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr ""
@@ -4848,17 +4764,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "Relacje"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "Pobieranie danych"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -4876,7 +4791,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "Relacje"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -4887,9 +4801,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -4898,15 +4812,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "Powtarza ostatnio wycofaną czynność."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -4916,9 +4829,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -4928,15 +4841,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -4944,5 +4857,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -4950,65 +4863,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
+#, fuzzy
+msgid "Select primitives for selected relation members"
+msgstr "Usuwa zaznaczoną relację."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "Przesuń aktualnie zaznaczonych członkół w górę"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii."
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Usuń wszystkie zaznaczone obiekty z relacji"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "Usuwa zaznaczoną relację."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr "Nie połączony"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5017,10 +4945,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "Sprzeczne relacje"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -5029,21 +4956,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Zapisuje bieżące dane."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5053,37 +4979,37 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Pobierz wszystkie niekompletne drogi i węzły w relacji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "Pobierz członków"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5093,30 +5019,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Zmniejsz"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5177,7 +5097,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "Załaduj zaznaczenie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -5211,7 +5130,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "dodaj do zaznaczenia"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6344,5 +6262,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Geolokalizowane obrazy"
@@ -6368,5 +6286,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6386,5 +6304,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "Pliki JPEG (*.jpg)"
@@ -6422,43 +6340,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "punkt GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Dostosuj rysowanie linii"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Użyj ustawień globalnych."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Rysuj linie pomiędzy punktami na tej warstwie."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Nie rysuj linii pomiędzy punktami na tej warstwie."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Wybierz opcje rysowania linii"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Dostosuj kolor"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6466,6 +6384,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6542,10 +6460,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Przekształć w warstwę danych"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6556,11 +6474,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6569,29 +6487,29 @@
 msgstr "Przekonwertowany z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 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:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "Pobierz wszystko pomiędzy:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metrów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "Maksymalny obszar na zapytanie:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km kw."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6602,5 +6520,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -6608,5 +6526,5 @@
 "danymi dźwiękowymi."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6614,5 +6532,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6662,5 +6580,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6686,5 +6604,5 @@
 msgstr[2] "tras"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6693,5 +6611,5 @@
 msgstr[2] "punktów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6701,5 +6619,5 @@
 msgstr[2] "trasa z {0} punktami"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6709,5 +6627,5 @@
 msgstr[2] "{0} składa się z {1} ścieżek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6717,9 +6635,9 @@
 msgstr[2] "{0} punktów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "znacznik GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6728,5 +6646,5 @@
 msgstr[2] "znaczników"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6736,14 +6654,14 @@
 msgstr[2] "{0} składa się z {1} markerów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "Synchronizacja dźwięku"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 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:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6751,14 +6669,14 @@
 msgstr "Dźwięk zsynchronizowany w punkcie {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 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:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6766,13 +6684,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Pokaż/Ukryj Tekst/Ikony"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Zmienia widoczność markerów tekstowych i ikon."
@@ -7385,7 +7303,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
-#, fuzzy
 msgid "JOSM Plugin description URL"
-msgstr "Opis symboli"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
@@ -7777,7 +7694,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -7851,4 +7768,9 @@
 msgstr "Przygotowywanie danych..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "Nie można odczytać \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -7860,7 +7782,69 @@
 msgstr "Nie można odczytać \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Uwaga: Licencja GPL nie jest zgodna z licencją OSM. Proszę nie przesyłać "
+"tras na licencji GPL."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "Pliki GPX"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "Opis trasy GPS"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Dodaj informacje o autorze"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Imię i nazwisko"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Prawa autorskie (URL)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Predefiniowane"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "Prawa autorskie - rok"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Słowa kluczowe"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Opcje eksportu"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "Eksportuj i zapisz"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Błąd podczas eksportu {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Wybierz jedną z gotowych licencji"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -7888,4 +7872,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Błąd parsowania: błędna struktura dokumentu gpx"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Nieznana rola \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8018,7 +8007,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "Przeglądanie katalogu {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8033,4 +8022,5 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8062,4 +8052,32 @@
 msgstr "Logowanie"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "Pliki serwera OSM"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr "Nie mogłem wykonać kopii bezpieczeństwa pliku. Wyjątek: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8117,30 +8135,26 @@
 msgstr "Błąd parsowania danych"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "Pliki serwera OSM"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Nieznana wersja"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "<nd> nie posiada referencji"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "Znaleziono tag <member> w"
@@ -8190,5 +8204,5 @@
 msgstr "Brak wymaganego atrybutu \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8197,9 +8211,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "Nieznany typ: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "Przygotowywanie danych OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "Zły format identyfikatora węzła"
@@ -8323,9 +8342,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
-"Uwaga - zażądano załadowania wtyczki {0}. Ta wtyczka nie jest już jednak "
-"potrzebna."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8347,5 +8364,5 @@
 #, java-format
 msgid "Last plugin update more than {0} days ago."
-msgstr "Wtyczkę ostanio zaktualizowano przed {0} dniami."
+msgstr "Ostatnia aktualizacja wtyczek odbyła się przed {0} dniami."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143
@@ -8418,7 +8435,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "Nie znaleziono informacji o wtyczce."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8809,23 +8825,23 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Bład w czasie pobierania obrazów z katalogu {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "Otwórz obrazy za pomocą AgPifoJ..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9066,5 +9082,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Błąd podczas ładowania pliku"
@@ -9113,28 +9129,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr "Kataster"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr "Nieprawidłowe odwzorowanie"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the JOSM projection to Lambert and restart"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9143,9 +9144,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
@@ -9305,13 +9306,20 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Kataster: {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9379,5 +9387,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr ""
@@ -10087,22 +10095,27 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr "Łączenie"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr "Połączony"
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr "Nie połączony"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr "Połączenie nie powiodło się"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "nazwa"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10135,32 +10148,32 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center Once"
 msgstr "Wycentruj raz"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr "Centruj ciągle"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr ""
@@ -10402,24 +10415,24 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -10658,10 +10671,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
+#, fuzzy, java-format
+msgid "{0} start"
 msgstr "początek"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr "koniec"
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} węzeł"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11188,10 +11203,10 @@
 msgstr "Przecinające się drogi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
@@ -11851,9 +11866,32 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "Proszę wybrać wiersz do edycji"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "Usuń warstwę"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+msgid "Start adjusting"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "Brak zmian do wysłania."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11868,57 +11906,57 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Zmiana rozdzielczości"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Błędny format pliku"
@@ -12500,5 +12538,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -15055,5 +15093,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15355,5 +15393,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15456,5 +15494,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -20080,7 +20118,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "sporty motorowe"
+msgstr ""
 
 #. color tertiary
@@ -23259,5 +23296,5 @@
 msgstr "Miasto"
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23268,5 +23305,5 @@
 msgstr "Jednokierunkowa"
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23276,5 +23313,5 @@
 msgstr "Kościół"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23285,5 +23322,5 @@
 msgstr "Stacja benzynwa"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23294,5 +23331,5 @@
 msgstr "Zakupy"
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23302,5 +23339,5 @@
 msgstr "WC"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23533,28 +23570,90 @@
 msgstr "Terraserver Urban"
 
-#~ 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 ""
-#~ "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 "No data"
-#~ msgstr "Brak danych"
-
-#~ msgid "Update failed"
-#~ msgstr "Aktualizacja się nie powiodła"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Warstwy: {0}"
-
-#~ 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 "Unknown file extension for file ''{0}''"
+#~ msgstr "Nieznay typ (tczy lyterki na koncu) pliku ''{0}''"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Nieznane rozszerzenie pliku."
+
+#~ msgid "Move"
+#~ msgstr "Przenieś"
+
+#~ msgid "Invalid projection"
+#~ msgstr "Nieprawidłowe odwzorowanie"
+
+#~ msgid "end"
+#~ msgstr "koniec"
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Object"
+#~ msgstr "Obiekt"
+
+#~ 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 "unnamed"
+#~ msgstr "bez nazwy"
+
+#~ msgid "Data Layer"
+#~ msgstr "Warstwa danych"
+
+#~ msgid "Not implemented yet."
+#~ msgstr "Jeszcze nie zaimplementowane."
+
+#~ 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 "Date"
+#~ msgstr "Data"
+
+#~ msgid "Revert"
+#~ msgstr "Wycofaj"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "Użytkownik OSM (email)"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Nawiązywanie połączenia z serwerem OSM..."
+
+#~ msgid "position"
+#~ msgstr "pozycja"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Validate"
+#~ msgstr "Zweryfikuj"
+
+#~ msgid "Charge"
+#~ msgstr "Opłata"
+
+#~ 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)"
 
 #~ msgid ""
@@ -23564,79 +23663,4 @@
 #~ "Wtyczka nie może zostać usunięta. Proszę przekaż informacje o tym "
 #~ "problemie autorom JOSM."
-
-#~ msgid "Validate"
-#~ msgstr "Zweryfikuj"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Weryfikuje bieżące zaznaczenie lub całość danych."
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Object"
-#~ msgstr "Obiekt"
-
-#~ 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 "unnamed"
-#~ msgstr "bez nazwy"
-
-#~ msgid "Data Layer"
-#~ msgstr "Warstwa danych"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Jeszcze nie zaimplementowane."
-
-#~ 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 "Date"
-#~ msgstr "Data"
-
-#~ msgid "Revert"
-#~ msgstr "Wycofaj"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "Użytkownik OSM (email)"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Nawiązywanie połączenia z serwerem OSM..."
-
-#~ msgid "position"
-#~ msgstr "pozycja"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Charge"
-#~ msgstr "Opłata"
-
-#~ 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)"
 
 #~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
@@ -23716,4 +23740,7 @@
 #~ msgstr "Konflikty: {0}"
 
+#~ msgid "Layers: {0}"
+#~ msgstr "Warstwy: {0}"
+
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr ""
@@ -23764,4 +23791,7 @@
 #~ msgstr "YAHOO (WebKit GTK)"
 
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Weryfikuje bieżące zaznaczenie lub całość danych."
+
 #~ msgid "Portcullis"
 #~ msgstr "brona"
@@ -23803,4 +23833,7 @@
 #~ 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 "Tagging preset source"
@@ -23848,5 +23881,24 @@
 
 #~ 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 ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
 #~ msgstr "Ta akcja wymaga wykonania {0} pobrań danych. Kontynuować?"
+
+#~ 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 "No data"
+#~ msgstr "Brak danych"
+
+#~ msgid "Update failed"
+#~ msgstr "Aktualizacja się nie powiodła"
Index: /applications/editors/josm/i18n/po/pt_BR.po
===================================================================
--- /applications/editors/josm/i18n/po/pt_BR.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/pt_BR.po	(revision 16973)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 16:19+0200\n"
-"PO-Revision-Date: 2009-08-01 04:18+0000\n"
-"Last-Translator: Nighto <Unknown>\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-06 00:29+0000\n"
+"Last-Translator: vitor <vitor.george@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,13 +16,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2009-08-04 13:49+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -47,15 +40,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -80,7 +65,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -88,4 +73,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -107,8 +96,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Erro"
@@ -119,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Alterações Não Salvas"
@@ -137,16 +128,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -158,13 +148,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -181,4 +172,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "Cancelar"
@@ -192,5 +184,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -199,5 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -208,23 +201,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -245,5 +238,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Aviso"
@@ -277,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -308,5 +301,5 @@
 msgstr "Relatório de erros"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -373,15 +366,15 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Please select the target layer."
-msgstr ""
+msgstr "Por favor a camada destino"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 msgid "Select target layer"
-msgstr ""
+msgstr "Selecione camada destino"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr ""
+msgstr "Combinar"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -391,8 +384,10 @@
 "</html>"
 msgstr ""
+"<html>Não há camadas em que a camada<br>''{0}''<br>possa ser combinada.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 msgid "No target layers"
-msgstr ""
+msgstr "Sem camadas destino"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
@@ -420,5 +415,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -451,18 +446,18 @@
 msgstr "Longitude"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Alinhar Nós em círculo"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Mover nós selecionados em um círculo"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -491,18 +486,18 @@
 msgstr "Ferramenta: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Por favor, selecione no mínimo 4 nós."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -515,5 +510,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -643,13 +638,13 @@
 msgstr "Combinar vários caminho em um só"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Por favor selecione no mínimo 2 caminhos a combinar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "Combinar caminhos com membros diferentes?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -659,13 +654,13 @@
 "mesmo assim?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "Combinar assim mesmo"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Inverter direções?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -675,9 +670,9 @@
 "algum destes?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Inverter e Combinar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -686,5 +681,5 @@
 msgstr "Entrada de valores para todos conflitos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -692,14 +687,14 @@
 msgstr "Resolver conflitos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combinar {0} caminhos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "Todos caminhos estavam vazios"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -718,23 +713,23 @@
 msgstr "Copiar objetos selecionados para memória de colagem"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Por favor selecione algo a ser copiado"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Criar Círculo"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Criar círculo a partir de três nós selecionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr "Os nós não estão em circulo. Abortando."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -748,8 +743,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -769,15 +764,15 @@
 msgstr "Excluir os objetos selecionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "O arquivo já existe. Sobrescrever?"
@@ -839,5 +834,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -848,5 +843,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
 msgid "Conflicts during download"
-msgstr ""
+msgstr "Conflitos durante download"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -857,5 +852,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Duplicar"
@@ -879,92 +875,36 @@
 msgstr "Sair do aplicativo."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Nota: A licença GPL não é compatível com a OSM. Não carregue vias/trilhas "
-"licenciadas pela GPL."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Exportar para GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Exportar dados para arquivo GPX."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Nada a exportar. Escolha alguns dados antes."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr "parâmetro \"{0}\" não pode ser vazio"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr "se esperava instância de OsmDataLayer ou GpxLayer. Obtido \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "Descrição da trilha do GPS"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Adicionar informação do autor"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Nome Real"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Direitos autorais (URL)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Pré-definido"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "Ano dos direitos autorais"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Palavras-chave"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Opções de exportação"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "Exportar e Salvar"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Erro durante exportação {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Escolha uma licença pré-definida"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "Exportar dados para arquivo GPX."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -980,6 +920,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1053,5 +993,5 @@
 msgstr "Unir um nó ao segmento de caminhos mais próximo"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "Unir Nó e Linha"
@@ -1063,9 +1003,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
 msgid "Merge layer"
-msgstr ""
+msgstr "Combinar camada"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
 msgid "Merge the current layer into another layer"
-msgstr ""
+msgstr "Combinar camada atual em outra camada"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1111,9 +1051,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 msgid "Merge selection"
-msgstr ""
+msgstr "Combinar seleção"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 msgid "Merge the currently selected primitives into another layer"
-msgstr ""
+msgstr "Combinar primitivas selecionadas atualmente em outra camada"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1173,5 +1113,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "Novo"
@@ -1193,5 +1133,5 @@
 #, java-format
 msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
-msgstr ""
+msgstr "<html>Não foi possível ler arquivo ''{0}''. O erro é: <br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
@@ -1265,5 +1205,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Colar"
@@ -1275,5 +1215,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Colar Tags"
@@ -1324,5 +1264,5 @@
 #, java-format
 msgid "Could not rename file ''{0}''"
-msgstr ""
+msgstr "Não foi possível renomear arquivo ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1359,5 +1299,10 @@
 msgstr "Arquivo {0} já existe. Substituí-lo?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "Nenhum documento aberto, portanto não há nada a salvar."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1367,25 +1312,25 @@
 "favor, relate isso como uma falha do programa."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "Nenhum documento aberto, portanto não há nada a salvar."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Documento vazio"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "O documento não contém dados."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "Salvar mesmo assim"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Conflitos"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1395,57 +1340,19 @@
 "se você rejeitar todos. Continuar?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "Rejeitar Conflitos e Salvar"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "Salvar arquivo OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "Salvar arquivo GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "Salvar Camada"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Extensão de arquivo desconhecida."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1560,5 +1467,5 @@
 "no meio do caminho.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1566,5 +1473,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1572,5 +1479,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1836,5 +1743,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
 msgid "upload all changes in one request"
-msgstr ""
+msgstr "enviar todas modificações em um pedido"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1843,4 +1750,6 @@
 "changed primitive"
 msgstr ""
+"Habilitar para envio de todas modificações em uma chamada, desabilitar para "
+"usar uma chamada por primitiva"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464
@@ -1993,5 +1902,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
 msgid "Updating data"
-msgstr ""
+msgstr "Enviando dados"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
@@ -2042,5 +1951,5 @@
 msgstr "Modo: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2050,6 +1959,6 @@
 "usados ao apagar um caminho. Ctrl: apaga  objetos referentes."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2060,8 +1969,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2106,38 +2015,38 @@
 msgstr "selecionado"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "Não é possível adicionar nó fora do planeta."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Adicionar nó"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Adicionar nó no caminho"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "Conectar caminho existente a nó"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Adicionar um novo nó a um caminho existente"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "Adicionar nó em um caminho e conectar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "Criar novo nó."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "Selecionar nó sob o cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2146,14 +2055,14 @@
 msgstr[1] "Inserir novo nó em {0} caminhos."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "Começar novo caminho a partir do último nó."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "Continuar caminho a partir do último nó."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "Finalizar desenho."
@@ -2173,5 +2082,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Solte o botão do mouse para selecionar os objetos no retângulo."
@@ -2183,5 +2092,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "Solte o botão do mouse para parar de girar"
@@ -2218,9 +2127,9 @@
 msgstr[1] "Adicionar e mover um novo nó virtual a {0} caminhos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr "Mover elementos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2233,13 +2142,13 @@
 "Quer realmente movê-los?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr "Mova-os"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr "Desfazer mover"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2248,5 +2157,5 @@
 "próximo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2478,26 +2387,26 @@
 "ou relação."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Credencial de autenticação inesperada: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr "Faltam argumentos para \"or\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr "Falta argumento para \"not\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "Fechamento de parenteses esperado."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Número de parametros incorreto para operador de nós."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2508,5 +2417,5 @@
 "de nós ou um intervalo, por exemplos, os nós:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2596,7 +2505,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr ""
+msgstr "Conflito duplo"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2613,5 +2522,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2657,5 +2566,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "Deletar da relação"
@@ -2670,5 +2579,5 @@
 "Apagar da relação?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr "Dividir segmento de via"
@@ -2676,5 +2585,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2686,7 +2596,7 @@
 "<br>Realmente quer apagar?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr ""
+msgstr "Apagar confirmação"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2696,9 +2606,227 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Mover"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "Unir {0} nós"
+msgstr[1] "Unir {0} nós"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr "Purgando 1 primitiva"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr "removendo referência de caminho {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+"Aviso: Limpando via {0}  porque o número de nós reduziu para abaixo de 2. "
+"Atualmente é {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr "removendo referência da relação {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr "Resolver conflitos na lista de membros da relação {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr "Apagar membro de relação {0}{1}"
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "Rotacionar {0} {1}"
+msgstr[1] "Rotacionar {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Sequência"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "Resolver {0} conflito de tag em {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr "Desfazendo exclusão de {0} primitivas"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr "Resolver conflitos de versão para {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr "Resolver conflitos na lista de nós do caminho {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr "Dataset Principal não inclui nó {0}"
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Aplicar?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"Ao reverter esta via, as seguintes alterações nas propriedades dela e em "
+"seus nós são sugeridas para manter a consistência dos dados."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Relação"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Regra antiga"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "Nova regra"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Chave antiga"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Valor antigo"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Nova chave"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "Novo valor"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Aplicar alterações selecionadas"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Não aplicar alterações"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "Por favor, selecione quais alterações de propriedades quer aplicar."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Propriedades de "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr "Regras em relações referentes a"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Correção automática de tags"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Erro no arquivo de configuração nas linhas {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Não foi possível abrir o diretório de preferências: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+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}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Preferências gravadas em {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Não foi possível enviar preferências. Motivo: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "Não foi possível obter preferências do servidor."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr "já registrado um conflito para a primitiva \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "Graus decimais"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "Graus Minutos Segundos"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "O"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "L"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "Mudar {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr "parametro {0} > 0 necessário. Obtido {1}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "incompleto"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2712,214 +2840,4 @@
 msgstr[1] "nós"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr "Purgando 1 primitiva"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr "removendo referência de caminho {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-"Aviso: Limpando via {0}  porque o número de nós reduziu para abaixo de 2. "
-"Atualmente é {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr "removendo referência da relação {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr "Resolver conflitos na lista de membros da relação {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr "Apagar membro de relação {0}{1}"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr "Rotacionar {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Sequência"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "Resolver {0} conflito de tag em {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr "Desfazendo exclusão de {0} primitivas"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "Resolver conflitos de versão para {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr "Resolver conflitos na lista de nós do caminho {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr "Dataset Principal não inclui nó {0}"
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Aplicar?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"Ao reverter esta via, as seguintes alterações nas propriedades dela e em "
-"seus nós são sugeridas para manter a consistência dos dados."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "Relação"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "Regra antiga"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "Nova regra"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Chave antiga"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Valor antigo"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Nova chave"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "Novo valor"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "Aplicar alterações selecionadas"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "Não aplicar alterações"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "Por favor, selecione quais alterações de propriedades quer aplicar."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "Propriedades de "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr "Regras em relações referentes a"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "Correção automática de tags"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Erro no arquivo de configuração nas linhas {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Não foi possível abrir o diretório de preferências: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-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}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Preferências gravadas em {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Não foi possível enviar preferências. Motivo: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "Não foi possível obter preferências do servidor."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr "já registrado um conflito para a primitiva \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "Graus decimais"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "Graus Minutos Segundos"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "O"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "L"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "parametro {0} > 0 necessário. Obtido {1}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "incompleto"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2951,5 +2869,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2982,5 +2900,5 @@
 msgstr "parametro ''{0}'' não é uma classe aceitável, obtido ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -2989,22 +2907,22 @@
 msgstr[1] "{0} membros"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "rodovia"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "ferrovia"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "água"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "uso da terra"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -3073,10 +2991,12 @@
 msgstr "via multipolígonos \"{0}\" não está fechada."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "Membro vazio na relação."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3084,5 +3004,5 @@
 msgstr "Apagado membro ''{0}'' na relação."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3090,57 +3010,57 @@
 msgstr "Way ''{0}'' com menos de dois pontos."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr "Mais de um caminho \"de\" encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr "Mais de um caminho \"para\" encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr "Encontrado mais de um parâmetro \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Regra desconhecida \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo de membro desconhecido para \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr "Nenhum caminho \"de\" encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr "Nenhuma caminho \"para\" encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr "Não encontrei nenum nó ou caminho com o parâmetro \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 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\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 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\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 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\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 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\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3192,5 +3112,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3228,4 +3148,8 @@
 msgid "WGS84 Geographic"
 msgstr "Geografia WGS84"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111
@@ -3264,4 +3188,16 @@
 msgstr "Zona UTM {0}"
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
 #, java-format
@@ -3308,4 +3244,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3338,5 +3275,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
 msgid "Security exception"
-msgstr ""
+msgstr "Exceção de segurança"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
@@ -3349,5 +3286,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "Network exception"
-msgstr ""
+msgstr "Exceção de rede"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
@@ -3576,6 +3513,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3604,39 +3541,39 @@
 msgstr "Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "Mover para direita"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Mapa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "Mover para esquerda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Mover para cima"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Mover para baixo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "Aumentar zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Diminuir zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "escala"
@@ -3670,10 +3607,10 @@
 msgstr "(nenhum objeto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "camada não está na lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3757,12 +3694,12 @@
 msgstr "regra {0} não participa no par de comparação {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Propriedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3771,6 +3708,6 @@
 msgstr "Etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3778,30 +3715,30 @@
 msgstr "Nós"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "Nenhum conflito de tags pendentes a ser resolvido"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Etiquetas({0} conflitos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} conflitos de tagueamento à serem resolvidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Nós (resolvido)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
@@ -3810,17 +3747,17 @@
 "lista de nós desta via."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Nós (com conflitos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "Conflitos pendentes na lista de nós desta via"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Membros(resolvido)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3830,25 +3767,25 @@
 "na lista de membros desta relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Membros(com conflitos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Conflitos pendentes na lista de membros desta relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr "Nenhum conflito de propriedades pendente"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Propriedades(com conflitos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr "Conflito de propriedades pendente de solução"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Resolução de Conflito"
@@ -4069,8 +4006,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4307,5 +4244,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4318,5 +4255,5 @@
 msgstr "Primitivo"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4353,6 +4290,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4365,6 +4302,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4435,7 +4372,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4501,5 +4438,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
 msgid "Close anyway"
-msgstr ""
+msgstr "Fechar assim mesmo"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4519,5 +4456,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210
 msgid "Conflict not resolved completely"
-msgstr ""
+msgstr "Conflito não resolvido completamente"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:246
@@ -4577,82 +4514,83 @@
 msgstr "Mostrar histórico da primitiva selecionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Camadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Abrir uma lista com camadas carregadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Excluir camada selecionada."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "Excluir Camada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
+msgstr "Confirmação"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
+msgstr "Sim"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+msgstr "Não"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+msgstr "Apagar tudo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Mostrar/Ocultar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Mudar estado de visibilidade do layer selecionado."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
+msgstr "Ativar"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
+msgstr "Ativar camada selecionada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr "Combinar esta camada em outra camada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Mover a camada selecionada uma linha acima."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Mover camada selecionada uma linha abaixo."
@@ -4660,8 +4598,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
 msgid "Information about layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr "Informação sobre camada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4670,22 +4608,22 @@
 msgstr[1] "Isto modificará {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "Um valor vazio apaga a chave."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Modificar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4693,5 +4631,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4700,49 +4638,40 @@
 msgstr[1] "Modificar propriedades de até {0} objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Por favor, selecione uma chave"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Por favor, selecione um valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 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/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "Propriedades/Associações"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Propriedades dos objetos selecionados."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "Membro de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "Modificar relação"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, 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/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "Adicionar Propriedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4759,63 +4688,77 @@
 msgstr "Adicionar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 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/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "Editar Propriedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 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/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Propriedades: {0} / Membros: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "Propriedades / Associações"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "Modificar relação"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, 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/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "Excluir a chave selecionada em todos objetos"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "Excluir Propriedades"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "Excluir a chave selecionada em todos objetos"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Propriedades: {0} / Membros: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "Propriedades / Associações"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Relações"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "Abrir uma lista de de todas as relações."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relações: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Abrir um editor para a relação selecionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Excluir a relação selecionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Criar uma nova relação"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr "Criar uma cópia desta relação e abri-la em outra janela de edição"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4846,5 +4789,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4913,5 +4856,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Editar relação referente à relação selecionada atualmente"
@@ -4927,5 +4870,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
 msgid "Download selected relations"
-msgstr ""
+msgstr "Baixar relações selecionadas"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
@@ -4935,5 +4878,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr "Baixar membros do relaçoe"
@@ -4953,5 +4896,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
 msgid "Relation is deleted"
-msgstr ""
+msgstr "Relação está apagada"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
@@ -4963,5 +4906,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -4990,9 +4933,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr "Regra:"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5001,14 +4944,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr "Apagá-los, limpar relação"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+msgstr "Ignorá-los, deixar relação como está"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -5018,9 +4961,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+msgstr "Múltiplos membros referenciando a mesma primitiva"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -5030,5 +4973,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -5037,5 +4980,5 @@
 "membro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5044,5 +4987,5 @@
 "membro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5052,5 +4995,5 @@
 "membro selecionado"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5060,62 +5003,80 @@
 "membro selecionado"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Relation Editor: Remove Selected"
 msgstr "Editor de Relações: Remover Selecionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
+#, fuzzy
+msgid "Select primitives for selected relation members"
+msgstr "Excluir a relação selecionada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr "Classificar a relação de membros"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr "Editor de Relações: Classificar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "Mover os membros selecionados para cima"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr "Editor de Relações: Mover para cima"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "Mover membros selecionados para baixo"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr "Editor de Relações: Mover para Baixo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr "Editor de Relações: Remover"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5124,9 +5085,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -5135,20 +5096,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr "Aplicar atualizações e fechar aviso"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5158,37 +5119,37 @@
 msgstr "Aceitar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr "Cancelar atualizações e fechar janela"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr "Adicionar uma tag vazia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr "Apagar tags selecionadas atuais"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Baixar todas vias imcompletas e nós desta relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "Baixar membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr "Editor de Relações: Baixar Membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr "Definir uma papel para membros selecionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr "Aplicar papel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5198,19 +5159,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
-msgstr "Criar uma cópia desta relação e abri-la em outra janela de edição"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
@@ -6456,5 +6413,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Imagens Geotagueadas"
@@ -6480,5 +6437,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6497,5 +6454,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "Imagens JPEG (*.jpg)"
@@ -6533,43 +6490,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "ponto GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Personalizar linha"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Usar preferências globais."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Desenhar linhas entre pontos para esta camada."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Não desenhar linhas entre pontos para esta camada."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Selecionar opções de linha"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Personalizar cores"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6577,6 +6534,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6650,10 +6607,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Converter para camada de dados"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6664,11 +6621,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces (EN)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6677,29 +6634,29 @@
 msgstr "Convertido de: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr "Descarregar do OSM ao largo desta via"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "Descargar tudo entre:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "Área máxima por pedio:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6710,9 +6667,9 @@
 "Você deseja </br> continuar? </html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 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:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6720,5 +6677,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6768,5 +6725,5 @@
 msgstr "Converter para camada GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6791,5 +6748,5 @@
 msgstr[1] "trilhas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6797,5 +6754,5 @@
 msgstr[1] "pontos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6804,5 +6761,5 @@
 msgstr[1] "uma trilha com {0} pontos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6811,5 +6768,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6818,9 +6775,9 @@
 msgstr[1] "{0} pontos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "Marcador gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6828,5 +6785,5 @@
 msgstr[1] "marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6835,9 +6792,9 @@
 msgstr[1] "{0} consiste em {1} marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "Sincronizar audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -6846,5 +6803,5 @@
 "sincronização"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6852,14 +6809,14 @@
 msgstr "Audio sincronizado no ponto {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 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:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6867,13 +6824,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Mostrar/Esconder Texto/Ícones"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Alternar visibilidade do marcador de texto e ícones."
@@ -7880,7 +7837,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -7952,4 +7909,9 @@
 msgstr "Preparando dados..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "Não foi possível ler \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -7961,7 +7923,69 @@
 msgstr "Não foi possível ler \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Nota: A licença GPL não é compatível com a OSM. Não carregue vias/trilhas "
+"licenciadas pela GPL."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "Arquivos GPX"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "Descrição da trilha do GPS"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Adicionar informação do autor"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Nome Real"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Direitos autorais (URL)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Pré-definido"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "Ano dos direitos autorais"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Palavras-chave"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Opções de exportação"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "Exportar e Salvar"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Erro durante exportação {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Escolha uma licença pré-definida"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -7989,4 +8013,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Erro de interpretação: estrutura inválida para documento gpx"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Regra desconhecida \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8134,4 +8163,5 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8163,4 +8193,32 @@
 msgstr "Login"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "Arquivos do servidor OSM"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, fuzzy, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr "se esperava instância de OsmDataLayer ou GpxLayer. Obtido \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8218,30 +8276,26 @@
 msgstr "Erro durante interpretação."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "Arquivos do servidor OSM"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Versão desconhecida"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr "Faltando número de versão nos dados dos mapas"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr "Versão desconhecida: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr "Encontrado elemento <nd> em non-way."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "<nd> tem ref zero"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "Encontrado elemento <member> em non-relation."
@@ -8291,5 +8345,5 @@
 msgstr "Faltando atributo obrigatório \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8298,9 +8352,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "Tipo de membro desconhecido para \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "Preparando dados OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "Identificação de nó mal-formada"
@@ -8902,23 +8961,23 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr ""
 
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
+msgid "Open images with AgPifoJ..."
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
-msgid "Open images with AgPifoJ..."
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9157,5 +9216,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Erro ao carregar arquivo"
@@ -9202,28 +9261,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the JOSM projection to Lambert and restart"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9232,9 +9276,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
@@ -9396,12 +9440,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
 msgstr ""
 
@@ -9469,5 +9520,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr ""
@@ -10177,22 +10228,27 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr "Conectado"
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr "Não conectada"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr "Conexão falhou"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "nome"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10225,32 +10281,32 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+msgid "Capture GPS Track"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+msgid "Center Once"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+msgid "Center the LiveGPS layer to current position."
+msgstr ""
+
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
-msgid "Capture GPS Track"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
-msgid "Center Once"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
-msgid "Center the LiveGPS layer to current position."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
 msgid "Auto-Center"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -10486,24 +10542,24 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -10742,10 +10798,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
+#, fuzzy, java-format
+msgid "{0} start"
 msgstr "iniciar"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr "terminar"
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} nó"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11268,10 +11326,10 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
@@ -11930,9 +11988,32 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "Por favor, selecione a linha para editar."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "Selecione camada destino"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+msgid "Start adjusting"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "Não há modificações a enviar."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11945,57 +12026,57 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr ""
@@ -12577,5 +12658,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -15132,5 +15213,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15432,5 +15513,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15533,5 +15614,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -23335,5 +23416,5 @@
 msgstr "Vilarejo/Cidade"
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23344,5 +23425,5 @@
 msgstr "Mão única"
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23352,5 +23433,5 @@
 msgstr "Igreja"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23361,5 +23442,5 @@
 msgstr "Posto de Gasolina"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23370,5 +23451,5 @@
 msgstr "Compras"
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23378,5 +23459,5 @@
 msgstr "Banheiros"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23609,4 +23690,7 @@
 msgstr "Terraserver Urban"
 
+#~ msgid "Move"
+#~ msgstr "Mover"
+
 #~ msgid "Aborting..."
 #~ msgstr "Interrompendo..."
@@ -23753,4 +23837,17 @@
 #~ "a<br>resultados indesejados quando fizer alinhamentos retangulares."
 #~ "<br>Mude sua projeção para evitar esta notificação.<br>Pretende continuar?"
+
+#~ 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 "Unknown file extension."
+#~ msgstr "Extensão de arquivo desconhecida."
+
+#~ msgid "end"
+#~ msgstr "terminar"
 
 #~ msgid "YAHOO (GNOME)"
Index: /applications/editors/josm/i18n/po/ro.po
===================================================================
--- /applications/editors/josm/i18n/po/ro.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/ro.po	(revision 16973)
@@ -8,6 +8,6 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-07-14 17:39+0000\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-04 10:37+0000\n"
 "Last-Translator: Manuel R. Ciosici <manuelciosici@yahoo.com>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -17,16 +17,9 @@
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:33+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
 "X-Poedit-Language: Romanian\n"
 "X-Poedit-SourceCharset: utf-8\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -51,15 +44,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -84,7 +69,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -92,4 +77,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -111,8 +100,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Eroare"
@@ -125,5 +116,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Modificări nesalvate"
@@ -143,16 +134,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -164,13 +154,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -187,4 +178,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "Renunţă"
@@ -198,5 +190,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -205,5 +197,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -214,23 +207,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -251,5 +244,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Avertisment"
@@ -283,5 +276,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -314,5 +307,5 @@
 msgstr "Rapoarte erori"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -375,16 +368,14 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Vă rog selectaţi rândul care va fi şters."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Şterge stratul selectat."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
 msgstr ""
@@ -425,5 +416,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -456,18 +447,18 @@
 msgstr "Longitudine"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Aliniază Nodurile în Cerc"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Mută nodurile selectate într-un cerc."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -496,18 +487,18 @@
 msgstr "Unealtă: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Vă rog selectaţi cel puţin patru noduri."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -520,5 +511,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -641,13 +632,13 @@
 msgstr "Combină mai multe căi într-una."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Selectează te rog cel puţin două căi pentru a le combina."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -655,13 +646,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "Combină oricum"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Schimbă direcţiile?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -671,9 +662,9 @@
 "din ele?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Inversează şi Combină"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -682,5 +673,5 @@
 msgstr "Introdu valori pentru toate conflictele."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -688,14 +679,14 @@
 msgstr "Rezolvă Conflictele"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combină {0} căi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -712,23 +703,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -740,8 +731,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -761,15 +752,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Suprascrie"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "Fişierul există. Îl suprascriu?"
@@ -830,5 +821,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -848,5 +839,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr ""
@@ -870,88 +862,36 @@
 msgstr "Părăsiţi aplicaţia."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Exportă datele într-un fişier GPX."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Nimic de exportat. Obţineţi mai întâi nişte date."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "descrierea pistei gps"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Adaugă informaţii despre autor"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Nume real"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Drepturi de autor (adresă)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Predefinit"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "An drepturi de autor"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Cuvinte cheie"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Opţiuni exportare"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Alegeţi o licenţă predefinită"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "Exportă datele într-un fişier GPX."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -967,6 +907,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1037,5 +977,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr ""
@@ -1046,12 +986,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Redenumire strat"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "Salvează datele curente într-un fişier nou."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1093,7 +1031,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "selecţie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
@@ -1157,5 +1094,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr ""
@@ -1246,5 +1183,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr ""
@@ -1256,5 +1193,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr ""
@@ -1301,7 +1238,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Nu am putut redenumi fişierul \"{0}\"."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1338,5 +1275,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "Nu este nici un document deschis, nu este nimic de salvat."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1344,25 +1286,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "Nu este nici un document deschis, nu este nimic de salvat."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Document gol"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Conflicte"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1372,56 +1314,18 @@
 "ca şi cum aţi refuzat totul. Continui?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Extensie fişier necunoscută : {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Extensie fişier necunoscută."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
 msgstr ""
 
@@ -1527,5 +1431,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1533,5 +1437,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1539,5 +1443,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1782,7 +1686,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "Trimite toate schimbările la serverul OSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1940,7 +1843,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "Transmit datele"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
@@ -1985,5 +1887,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -1991,6 +1893,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2001,8 +1903,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2047,38 +1949,38 @@
 msgstr "selectat"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Adaugă nod"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2087,14 +1989,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr ""
@@ -2114,5 +2016,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2123,5 +2025,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr ""
@@ -2156,9 +2058,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2168,18 +2070,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2393,26 +2295,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2421,5 +2323,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2510,8 +2412,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Rezolvă Conflictele"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2528,5 +2429,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2568,5 +2469,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr ""
@@ -2579,5 +2480,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr ""
@@ -2585,5 +2486,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2592,5 +2494,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
 msgstr ""
@@ -2602,9 +2504,223 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Mută"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Secvenţă"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "Schimb {0} obiect"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "incomplet"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2619,208 +2735,4 @@
 msgstr[2] "de noduri"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Secvenţă"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "incomplet"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2853,5 +2765,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2884,5 +2796,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -2891,22 +2803,22 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -2971,10 +2883,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -2982,5 +2896,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -2988,57 +2902,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3090,5 +3004,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3122,4 +3036,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3154,13 +3072,25 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "Nu am putut citi semnele de carte."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "Nu am putut scrie semnele de carte."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3193,4 +3123,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3222,7 +3153,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "Excepţie netratată"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
@@ -3453,6 +3383,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3481,39 +3411,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "scală"
@@ -3547,10 +3477,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "stratul nu este în listă."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3632,12 +3562,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3646,6 +3576,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3653,47 +3583,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#, java-format
+msgid "{0} pending tag conflicts to be resolved"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
-#, java-format
-msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3701,25 +3631,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
@@ -3919,8 +3849,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4139,5 +4069,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4150,5 +4080,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4183,6 +4113,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4195,6 +4125,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4265,7 +4195,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4332,7 +4262,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Combină oricum"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4359,7 +4288,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Rezolvare conflicte"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4408,85 +4337,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Straturi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Deschide o listă cu toate straturile încărcate."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Şterge stratul selectat."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "Exista modificări nesalvate. Renunţ la modificări şi continui?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Contribuţii"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Şterge"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Arată/Ascunde"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Comută starea vizibilă a stratului selectat."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "Şterge stratul selectat."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Mută stratul selectat un rând în sus."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Mută stratul selectat un rând în jos."
@@ -4496,6 +4423,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4504,22 +4431,22 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<diferit>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Schimb valorile?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4527,5 +4454,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4534,50 +4461,41 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Vă rog selectaţi o cheie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Vă rog selectaţi o valoare"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 "Vă rog selectaţi obiectele pentru care doriţi să schimbaţi proprietăţile."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr ""
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4594,31 +4512,40 @@
 msgstr "Adaugă"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Add a new key/value pair to all objects"
 msgstr "Adaugă o nouă pereche cheie/valoare tuturor obiectelor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editează valoarea cheii selectata pentru toate obiectele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636
-msgid "Delete Properties"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
 msgid "Delete the selected key in all objects"
 msgstr "Şterge cheia selectată din toate obiectele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+msgid "Delete Properties"
 msgstr ""
 
@@ -4626,30 +4553,35 @@
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
@@ -4681,5 +4613,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4747,5 +4679,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -4764,11 +4696,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Încarcă selecţia"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr ""
@@ -4792,11 +4723,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "Descarc date"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -4824,9 +4755,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -4835,15 +4766,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "Refă ultima acţiune anulată."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -4853,9 +4783,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -4865,15 +4795,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -4881,5 +4811,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -4887,64 +4817,79 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
+msgid "Select primitives for selected relation members"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr ""
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr ""
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Reîncarcă toate obiectele selectate curent şi împrospătează lista."
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "Şterge stratul selectat."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -4953,10 +4898,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "Conflict"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -4965,21 +4909,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Salvează datele curente."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -4989,37 +4932,37 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5029,24 +4972,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Apropie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
@@ -5112,7 +5050,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "Încarcă selecţia"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -5146,7 +5083,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "adaugă la selecţie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6276,5 +6212,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Imagini geoetichetate"
@@ -6300,5 +6236,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6318,5 +6254,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "Imagine JPEG (*.jpg)"
@@ -6354,43 +6290,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "punct gps"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Personalizează trasarea liniilor"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Utilizează opţiunile globale."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Trasează linii între puncte pentru acest strat."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Nu trasa linii între puncte pentru acest strat."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Selectaţi opţiunile pentru trasarea liniilor"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Personalizează culoarea"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6398,6 +6334,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6471,10 +6407,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Converteşte la strat de date"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6483,11 +6419,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6496,29 +6432,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6527,9 +6463,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6537,5 +6473,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6585,5 +6521,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6609,5 +6545,5 @@
 msgstr[2] "de urme"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6616,5 +6552,5 @@
 msgstr[2] "de puncte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6624,5 +6560,5 @@
 msgstr[2] "o urmă cu {0} de puncte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6632,5 +6568,5 @@
 msgstr[2] "{0} este format din {1} de urme"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6640,9 +6576,9 @@
 msgstr[2] "{0} de puncte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6650,5 +6586,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6657,14 +6593,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 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:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6672,14 +6608,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6687,13 +6623,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
@@ -7692,7 +7628,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -7765,4 +7701,9 @@
 msgstr "Pregătesc datele..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "Nu am putut citi \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -7774,7 +7715,65 @@
 msgstr "Nu am putut citi \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "descrierea pistei gps"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Adaugă informaţii despre autor"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Nume real"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Drepturi de autor (adresă)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Predefinit"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "An drepturi de autor"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Cuvinte cheie"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Opţiuni exportare"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Alegeţi o licenţă predefinită"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -7802,4 +7801,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Gazdă necunoscută"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -7947,4 +7951,5 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -7976,4 +7981,32 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8031,30 +8064,26 @@
 msgstr "Eroare la prelucrare."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Versiune necunoscută"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr ""
@@ -8104,5 +8133,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8111,9 +8140,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, java-format
+msgid "Unknown relation member type {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr ""
@@ -8316,7 +8350,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "Adaugă informaţii despre autor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8680,23 +8713,23 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr ""
 
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
+msgid "Open images with AgPifoJ..."
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
-msgid "Open images with AgPifoJ..."
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -8935,5 +8968,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr ""
@@ -8980,28 +9013,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the JOSM projection to Lambert and restart"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9010,9 +9028,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
@@ -9172,12 +9190,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
 msgstr ""
 
@@ -9245,5 +9270,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr ""
@@ -9953,22 +9978,27 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr ""
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "nici unul"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10001,32 +10031,32 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+msgid "Capture GPS Track"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+msgid "Center Once"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+msgid "Center the LiveGPS layer to current position."
+msgstr ""
+
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
-msgid "Capture GPS Track"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
-msgid "Center Once"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
-msgid "Center the LiveGPS layer to current position."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
 msgid "Auto-Center"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr ""
@@ -10262,24 +10292,24 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -10518,10 +10548,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
+#, java-format
+msgid "{0} start"
 msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr ""
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} punct"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11044,10 +11076,10 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
@@ -11706,9 +11738,31 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "Vă rog selectaţi rândul care va fi editat."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+msgid "Select WMS layer"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+msgid "Start adjusting"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "Nu sunt schimbări de transmis."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11721,57 +11775,57 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr ""
@@ -12353,5 +12407,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -14908,5 +14962,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15208,5 +15262,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15309,5 +15363,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -23111,5 +23165,5 @@
 msgstr ""
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23120,5 +23174,5 @@
 msgstr ""
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23128,5 +23182,5 @@
 msgstr ""
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23137,5 +23191,5 @@
 msgstr ""
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23146,5 +23200,5 @@
 msgstr ""
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23154,5 +23208,5 @@
 msgstr ""
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23385,9 +23439,9 @@
 msgstr ""
 
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Eroare la inițializarea API-ului. Vă rog încercați mai târziu."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Inițializarea API-ului a eșuat"
+#~ msgid "Unknown file extension."
+#~ msgstr "Extensie fişier necunoscută."
+
+#~ msgid "Move"
+#~ msgstr "Mută"
 
 #~ msgid "Aborting..."
@@ -23475,2 +23529,8 @@
 #~ msgid "YAHOO (WebKit GTK)"
 #~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid "Failed to initialize API. Please try again later."
+#~ msgstr "Eroare la inițializarea API-ului. Vă rog încercați mai târziu."
+
+#~ msgid "API initialization failed"
+#~ msgstr "Inițializarea API-ului a eșuat"
Index: /applications/editors/josm/i18n/po/ru.po
===================================================================
--- /applications/editors/josm/i18n/po/ru.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/ru.po	(revision 16973)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-07-27 17:55+0000\n"
-"Last-Translator: kruvalig <Unknown>\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-07 11:57+0000\n"
+"Last-Translator: Minos <mxm-mmx@mail.ru>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,8 @@
 "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: 2009-08-04 09:34+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-Language: Russian\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -50,15 +43,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -83,7 +68,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -91,4 +76,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -110,8 +99,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Ошибка"
@@ -122,5 +113,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Несохранённые изменения"
@@ -140,16 +131,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -161,13 +151,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -184,4 +175,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "Отмена"
@@ -195,5 +187,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -202,5 +194,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -211,23 +204,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -248,5 +241,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Предупреждение"
@@ -280,5 +273,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -311,5 +304,5 @@
 msgstr "Отчёты об ошибках"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -377,19 +370,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Пожалуйста, выберите ряд для удаления."
+msgstr "Пожалуйста выберите слой."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Выберите один из вариантов:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "Объединить точки"
+msgstr "Объединить"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -402,5 +392,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 msgid "No target layers"
-msgstr ""
+msgstr "Не выбран слой"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
@@ -428,5 +418,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -459,18 +449,18 @@
 msgstr "Долгота"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Выстроить точки окружностью"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Переместить выделенные точки так, чтобы они сформировали окружность."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -499,18 +489,18 @@
 msgstr "Инструмент: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Выделите не менее четырёх точек."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -523,5 +513,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -651,13 +641,13 @@
 msgstr "Объединить несколько линий в одну."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Выделите не менее двух линий для объединения."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "Объединить линии, входящие в разные отношения?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -667,13 +657,13 @@
 "объединить?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "Объединить в любом случае"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Изменить направления?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -682,9 +672,9 @@
 "Линии с их текущими направлениями не объединить. Обратить некоторые линии?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Перевернуть и объеденить"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -693,5 +683,5 @@
 msgstr "Введите значения для всех конфликтов."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -699,14 +689,14 @@
 msgstr "Решение конфликтов"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Объединить {0} линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "Все линии были пустыми"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -725,24 +715,23 @@
 msgstr "Копировать выделенные объекты в буфер обмена."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Выделите что-нибудь для копирования."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Создать окружность"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Создать окружность по трём выделенным точкам"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "Точки не расположены по кругу"
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -754,8 +743,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -775,15 +764,15 @@
 msgstr "Удалить выделенные объекты."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Перезаписать"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "Файл уже существует. Перезаписать?"
@@ -831,18 +820,18 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download referrers from OSM..."
-msgstr ""
+msgstr "Загрузить зависимости с OSM..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download primitives referring to one of the selected primitives"
-msgstr ""
+msgstr "Загрузить примитивы связанные с выбранными примитивами"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42
 msgid "Download referrers..."
-msgstr ""
+msgstr "Загрузить зависимости..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -852,7 +841,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "Ошибка в течение загрузки"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -863,5 +851,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Дублировать"
@@ -885,92 +874,36 @@
 msgstr "Выйти из программы"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Внимание: GPL несовместима с лицензией OSM. Не загружайте треков, "
-"лицензированных под GPL"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Экспорт в GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Экспортировать данные в GPX файл"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Нет данных для экспорта. Создайте данные."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr "параметр ''{0}'' не должен быть нулевым"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr "ожидался экземпляр OsmDataLayer или GpxLayer. Получен ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "описание трека GPS"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Добавить информацию об авторе"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Настоящее имя"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Авторские права (ссылка)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Набор"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "Авторские права (год)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Ключевые слова"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Опции экспорта"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "Экспортировать и сохранить"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Ошибка при экспорте {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Выберите лицензию из набора"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "Экспортировать данные в GPX файл"
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -986,6 +919,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1059,5 +992,5 @@
 msgstr "Включить точку в состав ближайшей линии."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "Включить точку в линию"
@@ -1068,12 +1001,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Объединить в любом случае"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "Объединить выделенный слой с нижележащим."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1119,12 +1050,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "выделение"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Обновить выбранные примитивы с сервера"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1184,5 +1113,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "Создать"
@@ -1263,5 +1192,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
-#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1269,7 +1197,4 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 msgstr ""
-"<html>Используется проекция EPSG:4326, что может привести<br>к нежелательным "
-"результатам при выравнивании углов.<br>Измените проекцию, чтобы это "
-"предупреждение больше не появлялось.<br>Всё равно продолжить?"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1283,5 +1208,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Вставить"
@@ -1293,5 +1218,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Вставить тэги"
@@ -1338,7 +1263,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Невозможно переименовать файл \"{0}\"."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1375,5 +1300,10 @@
 msgstr "Файл {0} существует. Перезаписать?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "Пересечений не найдено. Изменений сделано не было."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1383,25 +1313,25 @@
 "создайте отчёт об ошибке."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "Нет открытых документов. Нечего сохранять."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Пустой документ"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "В документе не содержиться данных"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "Сохранить в любом случае"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Конфликты"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1411,59 +1341,19 @@
 "будут обработаны, как будто вы отменили их все. Продолжить?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "Отказаться от конфликтов и сохранить"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "Сохранить файл OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "Сохранить файл GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "Сохранить слой"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Невозможно создать резервную копию."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Неизвестное расширение файла: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr ""
-"<html>Произошла ошибка во время соединения с сервером<br>Подробности: {0}</"
-"html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr "При восстановлении из резервной копии возникла ошибка."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Неизвестное расширение файла."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "При сохранении возникла ошибка."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr "При восстановлении из резервной копии возникла ошибка."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1585,23 +1475,17 @@
 "линии)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
 "should verify this and correct it when necessary.</html>"
 msgstr ""
-"Участие в отношениях было применено ко всем новым линиям.\n"
-"Проверьте, и при необходимости внесите корректировки."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
-#, fuzzy
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
 "this and correct it when necessary.</html>"
 msgstr ""
-"Отношения членства были скопированы на все новые линии. \n"
-"Вы должны проверить и исправить, если это необходимо."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1740,12 +1624,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
-#, fuzzy
 msgid "No current dataset found"
-msgstr "Не найдено слоя данных GPX"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
-#, fuzzy
 msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr "Не могу найти примитив с ID {0} в текущем источнике данных"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
@@ -1869,7 +1751,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "Загрузить все изменения на OSM"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -2027,12 +1908,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "Загрузка данных"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr "Следующие ошибки произошли во время массового скачивания:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -2077,5 +1957,5 @@
 msgstr "Режим: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2086,6 +1966,6 @@
 "точки."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2096,8 +1976,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2142,38 +2022,38 @@
 msgstr "выбранные"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "Точка не может быть добавлена за пределами мира."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Добавить точку"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Вставить точку в линию"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "Присоединить линию к точке"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Добавить точку к линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "Добавить точку к линии и объединить"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "Создать новую точку"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "Выбирете точко под курсором"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2183,14 +2063,14 @@
 msgstr[2] "Вставить новую точку в {0} линий"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "Начать путь с последней точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "Продолжить путь с последней точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "Закончено вычерчивание"
@@ -2210,5 +2090,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике."
@@ -2219,5 +2099,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "Отпустите кнопку мыши, чтобы прекратить вращение."
@@ -2256,9 +2136,9 @@
 msgstr[2] "Добавьте или переместите новый виртуальный узел в {0} линиях"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr "Переместить элементы"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2270,13 +2150,13 @@
 "часто является ошибкой. Действительно переместить?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr "Переместить"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr "Отмена перемещения"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2285,5 +2165,5 @@
 "объединения с ближайшей точкой."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2518,26 +2398,26 @@
 "Неизвестный тип примитива: {0}. Разрешенные значения точка, линия или связь"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Неожиданный знак: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr "Отсутствуют параметры для \"ИЛИ\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr "Отсутствуют параметры для \"НЕ\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "Отсутствует закрывающая скобка"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Неверное число параметров для оператора точек."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2548,5 +2428,5 @@
 "или диапазон, например, 10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2637,23 +2517,22 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Разрешить конфликт"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
 "primitmive ''{1}''"
-msgstr "уже существует конфликт для примитива ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "Не найдено совпадений для ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2697,5 +2576,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "Удалить из связи"
@@ -2710,5 +2589,5 @@
 "Удалить из отношения?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr "Разделить сегмент линии"
@@ -2716,5 +2595,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2726,8 +2606,7 @@
 "использовать их.<br> Вы действительно хотите удалить их?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "Удалить из связи"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2737,9 +2616,227 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Переместить"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "Объединить {0} точек"
+msgstr[1] "Объединить {0} точек"
+msgstr[2] "Объединить {0} точек"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr "Очистка 1 примитива"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr "удаление ссылки из линии {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+"Внимание: Удаление линии {0}, так как количество точек стало меньше 2. "
+"Текущее значение {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr "удаление ссылки из связи {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr "Устранить конфликты в списке участников отношения {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr "Удалить участника отношений {0} {1}"
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "Повернуть {0} {1}"
+msgstr[1] "Повернуть {0} {1}"
+msgstr[2] "Повернуть {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Последовательность"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "Устранить конфликты тега {0} в {1}{2}"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr "Отменить удаление {0} примитивов"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr "Устранить конфликты версии для {0}{1}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr "Устранить конфликты в списке точек линии {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr "В основном наборе нет узла {0}"
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Применить?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"При изменении направления линии, предлагается исправить следующие параметры "
+"для поддержания целостности данных"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Отношение"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Старая роль"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "Новая роль"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Старый ключ"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Старое значение"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Новый ключ"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "Новое значение"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Применить выбранные изменения"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Не применять изменения"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "Пожалуйста, выберите, какие параметры нужно изменить."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Параметры "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr "Роли в отношениях, относящихся к"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Автоматически исправлять тэги"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Ошибка в файле конфигурации на строках {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Не удается прочитать каталог с настройками: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr "Файл настроек поврежден. Восстанавливаем из старой копии в {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Параметры сохранены на {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Невозможно загрузить параметры. Причина: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "Невозможно скачать параметры с сервера."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr "уже существует конфликт для примитива ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "Десятичные градусы"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "Градусы, минуты, секунды"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "Ю"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "С"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "З"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "В"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "Изменить {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr "параметр {0} должен быть > 0. Текущее значение {1}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "неполный"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2754,212 +2851,4 @@
 msgstr[2] "узлов"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr "Очистка 1 примитива"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr "удаление ссылки из линии {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-"Внимание: Удаление линии {0}, так как количество точек стало меньше 2. "
-"Текущее значение {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr "удаление ссылки из связи {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr "Устранить конфликты в списке участников отношения {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr "Удалить участника отношений {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr "Повернуть {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Последовательность"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "Устранить конфликты тега {0} в {1}{2}"
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr "Отменить удаление {0} примитивов"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "Устранить конфликты версии для {0}{1}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr "Устранить конфликты в списке точек линии {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr "В основном наборе нет узла {0}"
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Применить?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"При изменении направления линии, предлагается исправить следующие параметры "
-"для поддержания целостности данных"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "Отношение"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "Старая роль"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "Новая роль"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Старый ключ"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Старое значение"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Новый ключ"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "Новое значение"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "Применить выбранные изменения"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "Не применять изменения"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "Пожалуйста, выберите, какие параметры нужно изменить."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "Параметры "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr "Роли в отношениях, относящихся к"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "Автоматически исправлять тэги"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Ошибка в файле конфигурации на строках {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Не удается прочитать каталог с настройками: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr "Файл настроек поврежден. Восстанавливаем из старой копии в {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Параметры сохранены на {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Невозможно загрузить параметры. Причина: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "Невозможно скачать параметры с сервера."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr "уже существует конфликт для примитива ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "Десятичные градусы"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "Градусы, минуты, секунды"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "Ю"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "С"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "З"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "В"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "параметр {0} должен быть > 0. Текущее значение {1}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "неполный"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2992,5 +2881,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -3024,5 +2913,5 @@
 msgstr "параметр ''{0}'' - недопустимый класс, получен ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -3032,22 +2921,22 @@
 msgstr[2] "{0} участников"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "дорога"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "железная дорога"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "водоёмы"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "землепользование"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -3113,10 +3002,12 @@
 msgstr "многополигональная линия ''{0}'' не замкнута"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "В отношении имеется пустой член."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3124,5 +3015,5 @@
 msgstr "В отношении «{0}» имеется член, который был удален."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3130,57 +3021,57 @@
 msgstr "Путь «{0}» имеет меньше двух точек."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr "Найден больше чем один \"from\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr "Найден больше чем один \"to\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr "Найден больше чем один \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Неизвестная роль «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Неизвестный тип членства для «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr "Не найден путь \"from\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr "Не найден путь \"to\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr "Не найдена \"via\" точка или путь"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "\"from\" путь не начинается или заканчивается на \"via\" точке."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "\"to\" путь не начинается или заканчивается на \"via\" точке."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "\"from\" путь не начинается или заканчивается на \"via\" пути."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "\"to\" путь не начинается или заканчивается на \"via\" пути."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3232,5 +3123,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3268,4 +3159,8 @@
 msgid "WGS84 Geographic"
 msgstr "Географическая WGS84"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111
@@ -3304,13 +3199,25 @@
 msgstr "UTM Зона {0}"
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "Невозможно прочитать закладки"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "Невозможно записать закладки"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3348,4 +3255,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3377,16 +3285,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "Неожиданная ошибка"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
 msgstr ""
-"Не удается соединиться с сервером OSM. Пожалуйста, проверьте Ваше интернет-"
-"соединение."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3395,5 +3300,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -3401,6 +3306,4 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-"Ошибка создания подключения к серверу OSM {0}.\n"
-"Проверьте в настройках URL сервера  и наличие подключения к сети Internet."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
@@ -3622,6 +3525,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3650,39 +3553,39 @@
 msgstr "Аудио"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "Переместить вправо"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Карта: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "Переместить влево"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Переместить вверх"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Переместить вниз"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "Увеличить масштаб"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Уменьшить масштаб"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "масштаб"
@@ -3716,10 +3619,10 @@
 msgstr "(нет объекта)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "слоя нет в списке."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3801,12 +3704,12 @@
 msgstr "роль {0} не участвует в паре сравнения {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3815,6 +3718,6 @@
 msgstr "Тэги"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3822,30 +3725,30 @@
 msgstr "Точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Участники"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "Нет неразрешённых конфликтов тегов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Тэги({0} конфликтов)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} неразрешённых конфликтов тегов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Точки(решённые)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
@@ -3854,17 +3757,17 @@
 "узлов этого пути"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Узлы(с конфликтами)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "Неустранённые конфликты в списке узлов этого пути"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Члены(разрешённые)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3874,25 +3777,25 @@
 "конфликтов в списке участников этого отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Участники отношений(с конфликтами)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Неразрешённые конфликты в списке участников этого отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr "Нет актуальных конфликтов свойств"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Свойства (с конфликтами)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr "Конфликты свойств ожидающие устранения"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Разрешение конфликтов"
@@ -4113,8 +4016,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4346,5 +4249,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4357,5 +4260,5 @@
 msgstr "Примитив"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4390,6 +4293,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4402,6 +4305,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4472,7 +4375,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4535,7 +4438,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Продолжить в любом случае"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4544,5 +4446,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>You didn''t finish to merge the differences in this conflict."
@@ -4552,8 +4454,4 @@
 "<strong>{1}</strong> to return to resolving conflicts.</html>"
 msgstr ""
-"<html>Вы не закончили устранение конфликтов.<br>Нажмите <strong>{0}</strong> "
-"что бы в любом случае применить уже устранённые конфликты.<br>Вы можете "
-"устранить оставшиеся конфликты позже.<br>Нажмите <strong>{1}</strong> что бы "
-"вернуться к устранению конфликтов.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210
@@ -4566,7 +4464,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Устранить конфликты версии для {0}{1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4617,99 +4515,92 @@
 msgstr "Показать историю выделенного примитива"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Слои"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Показать список всех загруженных слоёв."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Удалить выбранный слой."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "Присутствуют несохранённые изменения. Всё равно удалить слой?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "Удалить слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "Вы действительно хотите удалить весь слой?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr "Вы действительно хотите удалить слой ''{0}''?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Информация"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr "Подтверждение"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "да"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr "Да"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "С"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr "Нет"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Удалить"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr "Удалить всё"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "Удалить {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Показать/скрыть"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Показать/скрыть выбранный слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "частный"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "Удалить выбранный слой."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "Объединить выделенный слой с нижележащим."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Переместить выделенный слой вверх."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Переместить выделенный слой вниз."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "Информационный стенд"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4719,22 +4610,22 @@
 msgstr[2] "Это изменит до {0} объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "Пустое значение удаляет ключ."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<различные>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Изменить значения?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4742,5 +4633,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4750,49 +4641,40 @@
 msgstr[2] "Изменить параметры {0} объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Пожалуйста, выберите ключ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Выберите значение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Please select the objects you want to change properties for."
 msgstr "Выберите объекты, для которых вы желаете изменить параметры."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "Параметры/отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Параметры выделенных объектов."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "Член группы"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "Изменить отношение"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "Удалить выделение из отношения {0}?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "Добавить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4809,63 +4691,77 @@
 msgstr "Добавить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Add a new key/value pair to all objects"
 msgstr "Добавить новую пару ключ/значение для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "Изменить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 msgid "Edit the value of the selected key for all objects"
 msgstr "Изменить значение выбранного ключа для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Свойств: {0} / Входит в отношения: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "Параметры / отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "Изменить отношение"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "Удалить выделение из отношения {0}?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "Удалить выбранный ключ из всех объектов"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "Удалить параметры"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "Удалить выбранный ключ из всех объектов"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Свойств: {0} / Входит в отношения: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "Параметры / отношения"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "Показать список всех отношений."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "Отношений: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Открыть редактор для выбранного отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Удалить выбранное отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Создать новое отношение"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr "Создать копию этих отношений и открыть их в другом окне"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4896,5 +4792,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4966,5 +4862,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -4975,21 +4871,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "Область для скачивания"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "Удалить выбранное отношение"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Скачать видимые квадраты"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr ""
@@ -5008,17 +4901,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "Редактор зависимостей: удалить выбранные"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "Загрузка Плагина {0}..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5036,7 +4928,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "Отношения"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -5047,9 +4938,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr "Роль:"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5058,15 +4949,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "Удалить Элементы из Отношений"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -5076,9 +4966,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -5088,5 +4978,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -5095,5 +4985,5 @@
 "членом"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5102,5 +4992,5 @@
 "члена"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5110,5 +5000,5 @@
 "выделенным членом"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5118,66 +5008,80 @@
 "выделенного члена"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Remove all members referring to one of the selected primitives"
-msgstr "Ошибка обновления выбранного примитива."
+msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Relation Editor: Remove Selected"
 msgstr "Редактор зависимостей: удалить выбранные"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
+#, fuzzy
+msgid "Select primitives for selected relation members"
+msgstr "Удалить выбранное отношение"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr "Редактор зависимостей: сортировать"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "Переместить выбранных членов отношения вверх"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr "Редактор зависимостей: поднять"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "Переместить выбранных членов отношения вниз"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr "Редактор зависимостей: опустить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Удалить все выделенные объекты из связей"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr "Редактор зависимостей: удалить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "Удалить выбранное отношение"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr "Продолжить решение"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5186,10 +5090,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "Конфликт в данных"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -5198,21 +5101,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Сохранить текущие данные."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr "Применить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr "Применить обновления и закрыть диалог"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5222,37 +5124,37 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr "Отменить обновления и закрыть диалог"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr "Добавить пустой тег"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr "Удалить выделенные теги"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Скачать недостающие части линий и узлов, участвующих в отношении"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "Скачать участников"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr "Редактор зависимостей: скачать членов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr "Задать роль для выбранных членов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr "Применить роль"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5262,32 +5164,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
-msgstr "Да, очистить"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
-msgstr "Подтверждение действия дистанционного управления"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
-msgstr "Создать копию этих отношений и открыть их в другом окне"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Уменьшить масштаб"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "Переместить выбранных членов отношения вниз"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5348,7 +5242,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "Загрузить выделенное"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -5383,7 +5276,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "Изменить расположение"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6519,5 +6411,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Изображения с данными о местоположении"
@@ -6543,5 +6435,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6561,5 +6453,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "Изображения JPEG (*.jpg)"
@@ -6597,43 +6489,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "точка GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Настроить отрисовку линий"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Использовать глобальные настройки."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Отображать линии между точками для этого слоя."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Не отображать линии между точками для этого слоя."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Выбрать варианты отрисовки линий"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Выбрать цвет"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6641,6 +6533,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6717,10 +6609,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Преобразовать в слой данных"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6731,11 +6623,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6744,29 +6636,29 @@
 msgstr "Преобразовано из: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr "Скачать с JSM данные вдоль трэка"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "Скачать всё в пределах:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} метров"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "Максимальная область для одного запроса:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6777,9 +6669,9 @@
 "Продолжить?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "No GPX track available in layer to associate audio with."
 msgstr "На слое отсутствует трек GPX, чтобы наложить звук."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6789,5 +6681,5 @@
 "будут пропущены или перенесены в начало трека."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6840,5 +6732,5 @@
 msgstr "Преобразовать в слой GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6864,5 +6756,5 @@
 msgstr[2] "треков"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6871,5 +6763,5 @@
 msgstr[2] "точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6879,5 +6771,5 @@
 msgstr[2] "трек с {0} точками"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6887,5 +6779,5 @@
 msgstr[2] "{0} состоит из {1} треков"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6895,9 +6787,9 @@
 msgstr[2] "{0} точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "маркер GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6906,5 +6798,5 @@
 msgstr[2] "маркеров"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6914,9 +6806,9 @@
 msgstr[2] "{0} состоит из {1} маркеров"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "Синхронизировать аудио"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -6924,5 +6816,5 @@
 "Вам необходимо приостановить звуковой файл в момент воспроизведения реплик."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6930,14 +6822,14 @@
 msgstr "Аудио синхронизировано на точке {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 msgid "Unable to synchronize in layer being played."
 msgstr "Невозможно синхронизировать слой который используется"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 msgid "Make Audio Marker at Play Head"
 msgstr "Установить маркер аудио на позиции проигрывания"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6947,13 +6839,13 @@
 "маркер."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 msgid "No existing audio markers in this layer to offset from."
 msgstr "Нет существующих аудио маркеров на этом слое"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Показать/скрыть текст/значки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Показать/скрыть текст и значки маркеров."
@@ -7594,7 +7486,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
-#, fuzzy
 msgid "JOSM Plugin description URL"
-msgstr "Добавить ссылку на описание JOSM плагина"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
@@ -8010,7 +7901,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8083,4 +7974,9 @@
 msgstr "Подготовка данных..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "Невозможно прочитать \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -8092,7 +7988,69 @@
 msgstr "Невозможно прочитать \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Внимание: GPL несовместима с лицензией OSM. Не загружайте треков, "
+"лицензированных под GPL"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "GPS файлы"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "описание трека GPS"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Добавить информацию об авторе"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Настоящее имя"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Авторские права (ссылка)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Набор"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "Авторские права (год)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Ключевые слова"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Опции экспорта"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "Экспортировать и сохранить"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Ошибка при экспорте {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Выберите лицензию из набора"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -8120,4 +8078,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Ошибка разбора: неправильная структура документа gpx"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Неизвестная роль «{0}»."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8256,7 +8219,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "Скнирование каталога {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8271,4 +8234,5 @@
 msgstr "Сервер возвратил ошибку с кодом {0}"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8300,4 +8264,32 @@
 msgstr "Идентификатор пользователя"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "OSM файлы сервера"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, fuzzy, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr "ожидался экземпляр OsmDataLayer или GpxLayer. Получен ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8367,30 +8359,26 @@
 msgstr "Ошибка при разборе."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "OSM файлы сервера"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Неизвестная версия"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr "Номер версии отсутствует по  данным OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr "Версия неизвестна: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr "Найден элемент <nd> вне пути."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "у <nd> нет ссылок ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "Найден тэг <member> вне отношения."
@@ -8444,5 +8432,5 @@
 msgstr "Отсутствует необходимый атрибут \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8451,9 +8439,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "Неизвестный тип членства для «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "Подготовка данных..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "Неверный номер точки"
@@ -8579,9 +8572,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
-"Внимание - произошёл запрос на загрузку модуля {0}. Этот модуль больше не "
-"требуется."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8672,7 +8663,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "Информации о модулях не найдено."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -9064,23 +9054,23 @@
 msgstr "Найден пустой файл в каталоге {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Ошибка чтения файлов в каталоге {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr "Коррелируют с GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} изображений имело тэги GPS"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "Открыть изображения через AgPifoJ..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9332,5 +9322,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Ошибка при загрузке файла"
@@ -9379,30 +9369,13 @@
 msgstr "Выберите Таблицу d'Assemblage"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr "Кадастр"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr "Авто источники"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr "Неправильная проекция"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr "Изменение проекции на {0} в первую очередь."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the JOSM projection to Lambert and restart"
-msgstr ""
-"Для включения кадастрового WMS плагина, измените\n"
-"в JOSM проекцию на Ламберта и перезапустите"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9411,9 +9384,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
@@ -9586,13 +9559,23 @@
 msgstr "Выделить основание здания"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr "Загрузить изображение с французского Cadastre WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Кадастр: {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+#, fuzzy
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
+msgstr ""
+"Для включения кадастрового WMS плагина, измените\n"
+"в JOSM проекцию на Ламберта и перезапустите"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9663,5 +9646,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr "Подстроить WMS"
@@ -10391,22 +10374,27 @@
 msgstr "Невозможно получить изображение"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr "Подключение"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr "Подключено"
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr "Не подключено"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr "Ошибка при подключении"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "название"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10439,33 +10427,33 @@
 msgstr "Слой LiveGPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
 msgstr "Захват пути GPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 "Связаться с сервером gpsd и показать текущее положение на слое LiveGPS."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center Once"
 msgstr "Центрировать"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center the LiveGPS layer to current position."
 msgstr "Центрировать слой LiveGPS на текущей позиции"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr "Авто-центровка"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Продолжить центрировать слой LiveGPS на текущей позиции"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -10716,25 +10704,25 @@
 msgstr "Разрешённые действия"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 "модуль дистанционного управления получил запрос на загрузку данных из API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr "Подробности запроса: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr "Разрешить действие?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr "Подтверждение действия дистанционного управления"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -10977,10 +10965,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
+#, fuzzy, java-format
+msgid "{0} start"
 msgstr "старт"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr "конец"
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} точка"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11531,10 +11521,10 @@
 msgstr "Пересекающиеся линии"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr "Дублированные узлы"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Этот тест проверяет, чтобы не было совпадения узлов."
@@ -12233,9 +12223,33 @@
 msgstr "Нет верных WMS URL или ID"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr "Отрегулируйте положение выбранного слоя WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "Пожалуйста, выберите ряд для редактирования."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "Сохраниеть WMS слой"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Start adjusting"
+msgstr "Начать маршрутизацию"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "Нет изменений для загрузки."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -12250,15 +12264,15 @@
 msgstr "Автоматическое скачивание"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Скачивание слоя WMS ({0}), в масштабе {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12267,37 +12281,37 @@
 "измените разрешение"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Скачать видимые квадраты"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Изменить разрешение"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Перезагрузить ошибочные фрагменты"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Альфа канал"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Сохранить слой WMS в файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr "Сохраниеть WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "Загрузить слой WMS из файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr "Загрузить WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -12305,5 +12319,5 @@
 "Не поддерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Ошибка формата файла"
@@ -12936,5 +12950,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -15491,5 +15505,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15791,5 +15805,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15892,5 +15906,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -20516,7 +20530,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "Автомагистраль"
+msgstr ""
 
 #. color tertiary
@@ -23695,5 +23708,5 @@
 msgstr "Город/Село"
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23704,5 +23717,5 @@
 msgstr "Односторонняя"
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23712,5 +23725,5 @@
 msgstr "Церковь"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23721,5 +23734,5 @@
 msgstr "Заправка"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23730,5 +23743,5 @@
 msgstr "Магазин"
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23738,5 +23751,5 @@
 msgstr "Туалет"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23969,48 +23982,18 @@
 msgstr "Terraserver Urban"
 
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Сбой инициализации API. Пожалуйста, попробуйте снова позднее."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Сбой инициализации API"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Не найдено данных для обновления. Вы уже открыли скачанный слой данных?"
-
-#~ msgid "No data"
-#~ msgstr "Нет данных"
-
-#~ msgid "Update failed"
-#~ msgstr "Ошибка обновления"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Прошущен примитив"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Применить частичное решение"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Слои: {0}"
-
-#~ msgid "Conflict created"
-#~ msgstr "Конфликт создан"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Удалить текущего участника из отношения"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "Невозможно удалить модуль. Сообщите разработчикам JOSM об этой проблеме."
-
-#~ msgid "Validate"
-#~ msgstr "Проверить"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Проверить выделенное, либо все загруженные данные"
+#~ msgid "Unknown file extension."
+#~ msgstr "Неизвестное расширение файла."
+
+#~ msgid "Move"
+#~ msgstr "Переместить"
+
+#~ msgid "Invalid projection"
+#~ msgstr "Неправильная проекция"
+
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Изменение проекции на {0} в первую очередь."
+
+#~ msgid "end"
+#~ msgstr "конец"
 
 #~ msgid "Email"
@@ -24105,4 +24088,10 @@
 #~ "повторите попытку позже."
 
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr ""
+#~ "Невозможно удалить модуль. Сообщите разработчикам JOSM об этой проблеме."
+
 #~ msgid "Occupied By"
 #~ msgstr "Объект"
@@ -24136,4 +24125,7 @@
 #~ msgstr "Некоторые точки - (почти) на одной линии"
 
+#~ msgid "Validate"
+#~ msgstr "Проверить"
+
 #~ msgid "Adjust the position of the WMS layer"
 #~ msgstr "Подстроить положение слоя WMS"
@@ -24162,4 +24154,7 @@
 #~ msgid "Add all currently selected objects as members"
 #~ msgstr "Сделать все выбранные объекты участниками отношения"
+
+#~ msgid "Remove the member in the current table row from this relation"
+#~ msgstr "Удалить текущего участника из отношения"
 
 #~ msgid ""
@@ -24224,4 +24219,10 @@
 #~ msgstr "EPSG:4326"
 
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Проверить выделенное, либо все загруженные данные"
+
+#~ msgid "Layers: {0}"
+#~ msgstr "Слои: {0}"
+
 #~ msgid "Conflicts: {0}"
 #~ msgstr "Конфликты: {0}"
@@ -24297,4 +24298,10 @@
 #~ 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 "Эта ошибка вызвана в течении массовой загрузки:"
@@ -24342,7 +24349,4 @@
 #~ msgid "Remove route nodes"
 #~ msgstr "Удалить узлы маршрутизации"
-
-#~ msgid "Start routing"
-#~ msgstr "Начать маршрутизацию"
 
 #~ msgid "No intersections found. Nothing was changed."
@@ -24473,4 +24477,10 @@
 #~ msgstr "Проверка существования примитива {0} в прошлом..."
 
+#~ msgid "Missing primitive"
+#~ msgstr "Прошущен примитив"
+
+#~ msgid "Update failed"
+#~ msgstr "Ошибка обновления"
+
 #~ msgid "Selection too big"
 #~ msgstr "Выборка слишком большая"
@@ -24506,7 +24516,19 @@
 #~ msgstr "Удалить мои"
 
+#~ msgid "API initialization failed"
+#~ msgstr "Сбой инициализации API"
+
+#~ msgid "Failed to initialize API. Please try again later."
+#~ msgstr "Сбой инициализации API. Пожалуйста, попробуйте снова позднее."
+
+#~ msgid "Apply partial resolutions"
+#~ msgstr "Применить частичное решение"
+
 #~ msgid "image loading..."
 #~ msgstr "изображение загружается..."
 
+#~ msgid "No data"
+#~ msgstr "Нет данных"
+
 #~ msgid "WGS84 Geographisch"
 #~ msgstr "ГСК WGS84"
@@ -24514,2 +24536,5 @@
 #~ msgid "Layer {0} must be in list of layers"
 #~ msgstr "Слой{0} должен быть в списке слоев"
+
+#~ msgid "Conflict created"
+#~ msgstr "Конфликт создан"
Index: /applications/editors/josm/i18n/po/sk.po
===================================================================
--- /applications/editors/josm/i18n/po/sk.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/sk.po	(revision 16973)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-07-29 07:45+0000\n"
-"Last-Translator: zdpo <zdposter@gmail.com>\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-06 19:34+0000\n"
+"Last-Translator: Vlado <babicvm@szm.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,13 +16,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:34+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -47,15 +40,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -80,7 +65,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -88,4 +73,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -107,8 +96,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Chyba"
@@ -119,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Neuložené zmeny"
@@ -137,16 +128,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -158,13 +148,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -181,4 +172,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "Zrušiť"
@@ -192,5 +184,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -199,5 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -208,23 +201,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -245,5 +238,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Varovanie"
@@ -277,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -308,5 +301,5 @@
 msgstr "Správy o chybách"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -372,19 +365,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Prosím vyberte riadok na odstránenie."
+msgstr "Prosím vyberte cieľovú vrstvu."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Vyberte buď:"
+msgstr "Výber cieľovej vrstvy"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "Zlúčiť body"
+msgstr "Zlúčiť"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -394,8 +384,10 @@
 "</html>"
 msgstr ""
+"<html>Nie sú tam vrstvy zdrojovej vrstvy<br>''{0}''<br>nemôžu byť zlúčené.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 msgid "No target layers"
-msgstr ""
+msgstr "Žiadne cieľové vrstvy"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
@@ -423,5 +415,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -454,18 +446,18 @@
 msgstr "Zemepisná dĺžka"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Zarovnať body do kruhu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Presunúť označené body do kruhu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -494,18 +486,18 @@
 msgstr "Nástroj: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Vyberte minimálne 4 body"
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -518,5 +510,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -645,13 +637,13 @@
 msgstr "Spojiť niekoľko ciet do jednej."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Prosím, vyberte aspoň dve cesty pre spojenie."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "Spojiť cesty patriace do rôznych vzťahov (relátion)?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -660,13 +652,13 @@
 "Zvolené cesty patria do iného vzťahu (relation). Naozaj ich chcete spojiť?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "Aj tak spojiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Zmeniť smer?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -676,9 +668,9 @@
 "ciest?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Otočiť a Spojiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -687,5 +679,5 @@
 msgstr "Zadajte hodnoty pre všetky konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -693,14 +685,14 @@
 msgstr "Riešenie konfliktov"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Spojiť {0} ciest"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "Všetky cesty boli prázdne"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -717,24 +709,23 @@
 msgstr "Vybrať označené objekty pre vloženie."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Prosím zvoľ niečo pre kopírovanie"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Vytvoriť kružnicu"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Vytvoriť kružnicu z troch vybratých bodov."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "Tieto body netvoria kružnicu."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr "Tieto body niesú v kruhu. Prerušujem."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -748,8 +739,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -769,15 +760,15 @@
 msgstr "Zmazať zvolené objekty."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Prepísať"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "Súbor už existuje. Prepísať?"
@@ -838,5 +829,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -846,7 +837,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "Chyby v priebehu sťahovania"
+msgstr "Konflikty počas sťahovania"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -857,5 +847,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Duplikovať"
@@ -879,92 +870,36 @@
 msgstr "Ukončť program."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Poznámka: GPL nie je kompatibilná s OSM licenciou. Nepridávajte záznamy s "
-"GPL licencoiu."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Exportovať do GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Exportovať dáta do GPX súboru."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Nie je nič na exportovanie. Najskôr stiahnite dáta."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr "paramenter ''{0}'' nesmie byť nulový"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr "očakávaný príklad z OsmDataLayer alebo GpxLayer. Got ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "popis gps trasy"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Pridať informáciu o autorovi"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Skutočné meno"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Copyright (URL)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Preddefinované"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "Copyright"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Kľúčové slová"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Možnosti exportu"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "Exportovať a Uložiť"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Chyba pri exporte {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Zvoľte preddefinovanú licenciu"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "Exportovať dáta do GPX súboru."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -980,6 +915,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1053,5 +988,5 @@
 msgstr "Pripojiť bod k najbližšej ceste"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "Spojiť body a línie"
@@ -1062,12 +997,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Aj tak zlúčiť"
+msgstr "Zlúčiť vrstvu"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "Spojiť vrstvy pod označenou"
+msgstr "Zlúčiť aktuálnu vrstvu do inej vrstvy"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1112,12 +1045,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "výber"
+msgstr "Zlúčiť výber"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Aktualizovať práve vybrané pôvodné zo servera"
+msgstr "Zlúčiť aktuálne vybrané pôvodné do inej vrstvy"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1177,5 +1108,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "Nový"
@@ -1251,5 +1182,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
-#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1257,7 +1187,4 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 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ť?"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1271,5 +1198,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Vložiť"
@@ -1281,5 +1208,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Vložiť vlastnosti"
@@ -1326,7 +1253,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Nemôžem premenovať súbor \"{0}."
+msgstr "Nemôžem premenovať súbor ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1363,5 +1290,10 @@
 msgstr "Súbor {0} existuje. Prepísať ho?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "Nenájdený žiadny priesečník. Nič nebolo zmenené."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1370,25 +1302,25 @@
 "Interná chyba: nemôžem overiť podmienky pre žiadne vrstvy. Hlásim chybu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "Nemám čo uložiť, pretože žiadny dokument nie je otvorený."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Prázdny dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "Dokument neobsahuje dáta."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "Uložiť akokoľvek"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1398,58 +1330,19 @@
 "vyriešené, ako by boli všetky odmietnuté. Pokračovať?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "Zamietnuť konflikty a Uložiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "Uložiť OSM súbor"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "Uložiť GPX súbor"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "Uložiť vrstvu"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Nemôžem zálohovať súbor."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Neznámy typ súboru: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr ""
-"<html>Nastala chyba počas komunikácie so serverom<br>Detaily: {0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr "Počas obnovenia zálohy došlo k chybe."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Neznáma prípona súboru"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "Počas ukladania došlo k chybe."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr "Počas obnovenia zálohy došlo k chybe."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1569,24 +1462,17 @@
 "cesty.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
 "should verify this and correct it when necessary.</html>"
 msgstr ""
-"Funkcia zakladajúca vzťahy (relation) členov zkopírovala všetky nové "
-"cesty..\n"
-"Môžete preveriť správnosť, ak je to nevyhnutné."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
-#, fuzzy
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
 "this and correct it when necessary.</html>"
 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é."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1727,12 +1613,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
-#, fuzzy
 msgid "No current dataset found"
-msgstr "GPS dátová vrstva nie je vytvorená."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
-#, fuzzy
 msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr "Nemôžem nájsť pôvodné s id {0} v aktuálnej dátovej sade"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
@@ -1853,7 +1737,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "Uložiť všetky zmeny na OSM server."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1992,8 +1875,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
@@ -2011,12 +1894,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "Nahrávam dáta"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr "Nasledujúce chyby nastali behom hromadného sťahovania:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -2061,5 +1943,5 @@
 msgstr "Režim: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2069,6 +1951,6 @@
 "nemaže body. CTRL: zmaže referenčné objekty."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2079,8 +1961,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2125,38 +2007,38 @@
 msgstr "zvolené"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "Nemôžem pridať body ležiace mimo svet."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Pridať bod"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Pridať bod do cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "Pripojiť existujúcu cestu do bodu"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Pridať nový bod do existujúcej cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "Pridať bod do cesty a spojiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "Vytvoriť nový bod."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "Zvoliť bod pod kurzorom."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2166,14 +2048,14 @@
 msgstr[2] "Vložiť nový bod do {0} ciest."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "Začiatok novej cesty z posledného bodu."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "Pokračovanie cesty z posledného bodu."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "Koniec kreslenia."
@@ -2193,5 +2075,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Pustite tlačítko myši pre vybratie objektov v obdĺžniku."
@@ -2203,5 +2085,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "Pustite tlačítko myši k zastaveniu otáčania"
@@ -2239,9 +2121,9 @@
 msgstr[2] "Pridať a posunúť virtuálny nový bod do {0} ciest"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr "Posunúť elementy"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2254,13 +2136,13 @@
 "Skutočne ich presunúť?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr "Posunúť ich(them)"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr "Krok späť posun"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2268,5 +2150,5 @@
 "Pustite tlačítko myši pre zastavenie pohybu. Ctrl spojí s najbližším bodom."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2497,26 +2379,26 @@
 "Neznámy pôvodný typ: {0}. Povolené hodnoty sú, body, cesty, alebo relácie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Neočakávaná značka: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr "Chýbajúci argument pre \"alebo\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr "Chýbajúci argument pre \"NOT\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "Očakávam uzatváraciu zátvorku."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Zlé číslo parametrov pre operátor bodov."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2527,5 +2409,5 @@
 "alebo rozsah bodov, napr. body:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2616,23 +2498,22 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Riešiť konflikt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
 "primitmive ''{1}''"
-msgstr "práve zapísaný má konflikt s pôvodným ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "Neboli nájdené záznamy pre \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2676,5 +2557,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "Zmazať z relácie (zo vzťahu"
@@ -2689,5 +2570,5 @@
 "Zmazať zo vzťahu (relation)?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr "Rozdeliť segment cesty"
@@ -2695,5 +2576,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2705,8 +2587,7 @@
 "<br>Naozaj ich chcete zmazať?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "Zmazať z relácie (zo vzťahu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2716,9 +2597,227 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Presunúť"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "Zlúčiť {0} body"
+msgstr[1] "Zlúčiť {0} body"
+msgstr[2] "Zlúčiť {0} body"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr "Vyčistenie 1 pôvodného"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr "vybranie odkazu z cesty {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+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}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr "vybranie odkazu z relácie {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr "Rozhodnutie konfliktov v member list of relation {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr "Odstrániť člena relácie {0} {1}"
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "Otočiť {0} {1}"
+msgstr[1] "Otočiť {0} {1}"
+msgstr[2] "Otočiť {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Sekvencia"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "Vyriešte {0} konfliktov značiek v {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr "Obnoviť {0} pôvodných"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr "Vyriešte konflikt verzií pre {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr "Vyriešte konflikt v poradí bodov v ceste {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr "Hlavná dátová sada neobsahuje bod {0}"
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Použiť?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"Keď otáčate túto cestu, nasledujúce zmeny vo vlastnostiach cesty a jej bodov "
+"sú navrhované v takom poradí aby zachovali konzistenciu dát."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Vzťah (relation)"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Stará funkcia"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "Nová funkcia"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Starý kľúč"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Stará hodnota"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Nový kľúč"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "Nová hodnota"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Použiť zvolené zmeny"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Neurobiť zmeny"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "Prosím vyberte, ktoré zmenené vlastnosti chcete použiť."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Vlastnosti "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr "Funkcie vo vzťahoch (relations) odkazujú na"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Automatická úprava značiek (tag)"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Poškodený konfiguračný súbor pri linke {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Nemôžem otvoríť adresár s nastavením: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+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}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Predvoľby uložené na {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Nemôžem nahrať predvoľby. Dôvod: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "Nemôžem nahrať predvoľby zo servera."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr "práve zapísaný má konflikt s pôvodným ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "Stupne"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "Stupne minúty sekundy"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "J"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "Z"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "V"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "Zmeniť {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr "parameter {0} > 0 požadovaný. Dostal {1}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "neúplný"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2733,212 +2832,4 @@
 msgstr[2] "bodov"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr "Vyčistenie 1 pôvodného"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr "vybranie odkazu z cesty {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-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}"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr "vybranie odkazu z relácie {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr "Rozhodnutie konfliktov v member list of relation {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr "Odstrániť člena relácie {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr "Otočiť {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Sekvencia"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "Vyriešte {0} konfliktov značiek v {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr "Obnoviť {0} pôvodných"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "Vyriešte konflikt verzií pre {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr "Vyriešte konflikt v poradí bodov v ceste {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr "Hlavná dátová sada neobsahuje bod {0}"
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Použiť?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"Keď otáčate túto cestu, nasledujúce zmeny vo vlastnostiach cesty a jej bodov "
-"sú navrhované v takom poradí aby zachovali konzistenciu dát."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "Vzťah (relation)"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "Stará funkcia"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "Nová funkcia"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Starý kľúč"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Stará hodnota"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Nový kľúč"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "Nová hodnota"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "Použiť zvolené zmeny"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "Neurobiť zmeny"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "Prosím vyberte, ktoré zmenené vlastnosti chcete použiť."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "Vlastnosti "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr "Funkcie vo vzťahoch (relations) odkazujú na"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "Automatická úprava značiek (tag)"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Poškodený konfiguračný súbor pri linke {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Nemôžem otvoríť adresár s nastavením: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-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}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Predvoľby uložené na {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Nemôžem nahrať predvoľby. Dôvod: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "Nemôžem nahrať predvoľby zo servera."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr "práve zapísaný má konflikt s pôvodným ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "Stupne"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "Stupne minúty sekundy"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "J"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "Z"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "V"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "parameter {0} > 0 požadovaný. Dostal {1}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "neúplný"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2971,5 +2862,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -3003,5 +2894,5 @@
 msgstr "parameter ''{0}''je neprijateľná trieda, dostáva ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -3011,22 +2902,22 @@
 msgstr[2] "{0} členov"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "komunikácie"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "železnica"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "vodný tok"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "využitie oblasti (landuse)"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -3092,10 +2983,12 @@
 msgstr "Cesta v multipolygóne ''{0}'' nie je uzatvorená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "Prázdny člen vo vzťahu (relation)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3103,5 +2996,5 @@
 msgstr "Vymazaný člen ''{0}'' vo vzťahu (relation)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3109,57 +3002,57 @@
 msgstr "Cesta ''{0}'' s menej, než dvoma bodmi."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr "Najdená viac než jedna \"from\" cesta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr "Najdené viac cieľových \"to\" ciest."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr "Viac ako jedna \"via\" najdená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Neznáma funkcia ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Neznámy typ člena pre ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr "Nenajdená cesta \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr "Nenajdená cesta \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr "Nie je \"via\" bod alebo cesta najdená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Cesta \"from\" nezačína, ani nekončí v bode \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3211,5 +3104,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3247,4 +3140,8 @@
 msgid "WGS84 Geographic"
 msgstr "WGS84 Zemepisné"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111
@@ -3283,13 +3180,25 @@
 msgstr "UTM Zone {0}"
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "Nemôžem prečítať záložky."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "Nemôžem zapísať do záložiek."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3328,4 +3237,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3357,16 +3267,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "Neočakávaná chyba programu."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
 msgstr ""
-"Nemôžem sa pripojiť k OSM serveru. Prosím skontrolujte si pripojenie k "
-"internetu."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3375,5 +3282,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -3381,7 +3288,4 @@
 "preferences and your internet connection.</html>"
 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."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
@@ -3405,7 +3309,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: failed to bring extended dialog always on top. Exception: {0}"
-msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65
@@ -3603,6 +3507,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3631,39 +3535,39 @@
 msgstr "Zvuk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "Presunúť vpravo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Mapa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "Presunúť vľavo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Posunúť vyššie"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Posunúť nižšie"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "Priblížiť"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Oddialiť"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "mierka"
@@ -3697,10 +3601,10 @@
 msgstr "(žiadny objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "vrstva nie je v zozname"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3782,12 +3686,12 @@
 msgstr "funkcia {0} sa nenachádza v porovnávenej dvojici {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3796,6 +3700,6 @@
 msgstr "Značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3803,30 +3707,30 @@
 msgstr "Body"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Členovia"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "Nevyriešený konflikt značiek musí byť vyriešený"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Značky({0} konfliktov)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} nevyriešený konflikt značiek musí byť vyriešený"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Body(vyriešené)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
@@ -3835,17 +3739,17 @@
 "tejto ceste."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Body(v konflikte)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "Nevyriešené konflikty v zozname bodov v tejto ceste"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Členy(vyriešené)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3855,25 +3759,25 @@
 "tejto relácii"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Členy(v konflikte)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Nevyriešené konflikty v zozname členov v tejto relácii"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr "Nevyriešený konflikt vo vlastnostiech"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Vlastnosti (s konfliktmi)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr "Nebyriešený konflikty vlastností musia byť vyriešené"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Rozhodnutie konfliktov"
@@ -4093,8 +3997,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4327,5 +4231,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4338,5 +4242,5 @@
 msgstr "Pôvodný"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4372,6 +4276,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4384,6 +4288,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4454,7 +4358,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4521,7 +4425,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Pokračovať akokoľvek"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4530,5 +4433,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>You didn''t finish to merge the differences in this conflict."
@@ -4538,8 +4441,4 @@
 "<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210
@@ -4552,7 +4451,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Vyriešte konflikt verzií pre {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4601,99 +4500,92 @@
 msgstr "Zobraziť priebeh z vybraných pôvodných"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Otvoriť zoznam všetkých nahratých vrstiev."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Odstrániť vybranú vrstvu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "Sú tu neuložené zmeny. Napriek tomu zmazať vrstvu?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "Vymazať vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "Naozaj chcete zmazať celú vrstvu?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Informácia"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "áno"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Odstrániť"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "Zmazať {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Zobraziť/Skryť"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Prepnúť viditeľnosť zvolenej vrstvy."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "private (len pre vlastníka)"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "Odstrániť vybranú vrstvu."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "Spojiť vrstvy pod označenou"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Presunúť zvolenú vrstvu o riadok hore."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Presunúť zvolenú vrstvu o riadok dole."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "Informačná tabuľa"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4703,22 +4595,22 @@
 msgstr[2] "Toto zmení až {0} objekty."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "Prázdna hodnota zmaže klúče"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<rôzne>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Zmeniť hodnoty ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4726,5 +4618,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4734,49 +4626,40 @@
 msgstr[2] "Zmeniť vlastnosti až {0} objektov."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Vyberte prosím kľúč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Vyberte prosím hodnotu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 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/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "Vlastnosti/Členstvo(memberships)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Vlastnosti pre zvolené objekty"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "Člen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "Zmeniť reláciu"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "Naozaj zmazať výber z relacie {0}?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "Pridať vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4793,63 +4676,77 @@
 msgstr "Pridať"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 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/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "Upraviť vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 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/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Vlastnosti: {0} / Memberships: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "Vlastnosti / Memberships"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "Zmeniť reláciu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "Naozaj zmazať výber z relacie {0}?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+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/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "Zmazať vlastnosti"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-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/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Vlastnosti: {0} / Memberships: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "Vlastnosti / Memberships"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "Otvoríť zoznam všetkých relácií"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relácie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Otvoriť editor pre zvolenú reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Zmazať vybraté relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Vytvoriť novú reláciu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr "Vytvoriť kópiu z tejto relácie a otvoriť ju inom editovacom okne"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4880,5 +4777,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4950,31 +4847,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Upraviť vzťah aktuálne vybraného člena relácie odkazujúceho na"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
-#, fuzzy
 msgid "Download all child relations (recursively)"
-msgstr "Stiahnuť členov relácie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "Stiahnuť plochu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "Sťahovanie týkajúcich sa relácií"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Stiahnuť viditeľné dlaždice"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr "Stiahnuť členov relácie"
@@ -4993,17 +4886,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "Nie je vybraná žiadna relácia"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "Sťahujem Pluginy {0}..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5021,7 +4913,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "Relácie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -5034,9 +4925,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr "Funkcia:"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5045,15 +4936,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "Odstránený Prvok z Relácií"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -5063,9 +4953,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -5075,5 +4965,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -5081,5 +4971,5 @@
 "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade pred prvým členom"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5087,5 +4977,5 @@
 "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade za posledným členom"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5095,5 +4985,5 @@
 "členom"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5103,67 +4993,80 @@
 "členom"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Remove all members referring to one of the selected primitives"
-msgstr "Sťahovanie pôvodných odkazov do jedného vybraného pôvodného"
+msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Relation Editor: Remove Selected"
 msgstr "Editor Relácií: Odstrániť Vybrané"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
+#, fuzzy
+msgid "Select primitives for selected relation members"
+msgstr "Zmazať vybraté relácie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr "Triedenie členov relácie"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr "Editor Relácií: Triedenie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "Pridať všetky zvolené objekty medzi členy"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr "Editor Relácií: Posun Hore"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "Presunúť zvolenú vrstvu o riadok dolu."
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr "Editor Relácií: Posun Dole"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Odstrániť všetky vybrané objekty z relácie(zo vzťahu)"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr "Editor Relácií: Odstrániť"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "Zmazať vybraté relácie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr "Pokračovanie rozhodnutia"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5171,13 +5074,10 @@
 "conflict and close the editor?</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>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "Konflikt v dátach"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -5186,21 +5086,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Uložiť aktuálne dáta."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr "Použiť"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr "Použiť aktualizácie a zavrieť dialógové okno"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5210,37 +5109,37 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr "Zrušiť(nepoužiť) aktualizácie a zavrieť dialógové okno"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr "Pridať prázdnu značku"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr "Vymazať aktuálne vybrané značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Stiahnuť všetky nekompletné cesty a uzly v relácii"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "Stiahnuť členov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr "Editor Relácií: Sťahovanie Členov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr "Nastavenie funkcie pre vybrané členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr "Použiť Funkciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5250,32 +5149,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
-msgstr "Áno, očistiť to"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
-msgstr "Potvrdiť činnosť vzdialenej kontroly"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
-msgstr "Vytvoriť kópiu z tejto relácie a otvoriť ju inom editovacom okne"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Oddialiť"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "Upraviť vzťah aktuálne vybraného člena relácie odkazujúceho na"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5336,12 +5227,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "Nahrať výber"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy
 msgid "Warning: ignoring exception because task was cancelled. Exception was: "
-msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70
@@ -5372,7 +5261,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "Zmeniť umiestnenie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6511,5 +6399,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Obrázky s GPS súradnicami"
@@ -6535,5 +6423,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6553,5 +6441,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG obrázky (*.jpg)"
@@ -6589,43 +6477,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "gps poloha bodu"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Prispôsobiť kresliacu trasu"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Použíť globálne nastavenie."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Kresliť spojnice medzi bodmi v tejto vrstve"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Nekresliť spojnice mezi bodmi v tejto vrstve"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Výber nastavenia kreslenej čiary"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Prispôsobiť farbu"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6633,6 +6521,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6709,10 +6597,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Konvertovať do dátovej vrstvy"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6723,11 +6611,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6736,29 +6624,29 @@
 msgstr "Prevedené z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr "Stiahnuť z OSM okolie tejto stopy (track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "Stiahnuť všetko vo vnútry:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metrov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "Maximálna plocha na požiadavku:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} štvorcových km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6769,9 +6657,9 @@
 "<br>Chcete pokračovať?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 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:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6781,5 +6669,5 @@
 "alebo za koncom, boli vynechané, alebo presunuté na začiatok."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6831,5 +6719,5 @@
 msgstr "Previesť do GPX vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6855,5 +6743,5 @@
 msgstr[2] "stopy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6862,5 +6750,5 @@
 msgstr[2] "bodov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6870,5 +6758,5 @@
 msgstr[2] "stopy s {0} bodmi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6878,5 +6766,5 @@
 msgstr[2] "{0} skladá sa z {1} stôp"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6886,9 +6774,9 @@
 msgstr[2] "{0} bodov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "gps značka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6897,5 +6785,5 @@
 msgstr[2] "značiek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6905,9 +6793,9 @@
 msgstr[2] "{0} pozostáva z {1} značiek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "Synchronizovať audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -6916,5 +6804,5 @@
 "synchronizácie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6922,14 +6810,14 @@
 msgstr "Zvuk zosynchronizovaný na bode {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 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:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 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:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6938,5 +6826,5 @@
 "Potrebujete pozastaviť(pause) audio v bode na stope, kde chcete mať znažku."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
@@ -6944,9 +6832,9 @@
 "posunutie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Zobraziť/Skryť Text/Ikony"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Prepínač zobrazovania značiek textu a ikon."
@@ -7581,7 +7469,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
-#, fuzzy
 msgid "JOSM Plugin description URL"
-msgstr "Pridať JOSM Plugin popis URL."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
@@ -7998,7 +7885,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8071,4 +7958,9 @@
 msgstr "Pripravujem dáta..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "Nemôžem čítať \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -8080,7 +7972,69 @@
 msgstr "Nemôžem čítať \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Poznámka: GPL nie je kompatibilná s OSM licenciou. Nepridávajte záznamy s "
+"GPL licencoiu."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "GPX súbory"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "popis gps trasy"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Pridať informáciu o autorovi"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Skutočné meno"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Copyright (URL)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Preddefinované"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "Copyright"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Kľúčové slová"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Možnosti exportu"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "Exportovať a Uložiť"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Chyba pri exporte {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Zvoľte preddefinovanú licenciu"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -8108,4 +8062,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Chyba parsovania: Chybná štruktúra GPX dokumentu"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Neznáma funkcia ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8249,7 +8208,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "Prehľadávam adresár {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8264,4 +8223,5 @@
 msgstr "Server odpovedal chybou s kódom {0}"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8293,4 +8253,32 @@
 msgstr "Prihlásenie"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "Súbory OSM Servera"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, fuzzy, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr "očakávaný príklad z OsmDataLayer alebo GpxLayer. Got ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr "Nemôžem zálohovať súbor. Výnimka je: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8357,30 +8345,26 @@
 msgstr "Chyba v priebehu parsovania"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "Súbory OSM Servera"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Neznáma verzia"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr "Chýba číslo verzie z OSM údajov"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr "Neznáma verzia: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr "Nájdený element <nd> mimo cesty."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "<nd> má nulový ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "Nájdený <member> element mimo relácie."
@@ -8431,18 +8415,21 @@
 msgstr "Chýba povinný atribút \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+#, java-format
 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} je neúplná pretože odkazované body chýbajú v načítaných "
-"dátach"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "Neznámy typ člena pre ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "Pripravujem OSM údaje..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "Zle formulované id bodu"
@@ -8571,9 +8558,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
-"Upozornenie - bolo požadované nahratie pluginu {0}. Tento plugin už nie je "
-"potrebný."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8664,7 +8649,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "Nenájdené informácie o plugine"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -9054,23 +9038,23 @@
 msgstr "Nájdený prázdny súbor v adresári {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Chyba pri získavaní súború z adresára {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr "Zladiť GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} boli nájdené s gps značkami."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "Otvoriť obrázky s AgPifoJ..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9321,5 +9305,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Chyba pri nahrávaní súboru"
@@ -9368,30 +9352,13 @@
 msgstr "Vybrať Tableau d'Assemblage"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr "Automatické získavanie"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr "Chybná projekcia"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr "Najskôr zmente projekciu na {0}."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-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"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9403,9 +9370,9 @@
 "Budete si želať obnoviť F11 pre grabovanie?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr "Obnoviť klávesovú skratku pre grabovanie F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM ja zastavený aby zmeny mohli byť prevedené"
@@ -9577,13 +9544,23 @@
 msgstr "Získať stopy budov"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr "Stiahnuť obrázok z francúzkeho Cadastre WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Cadastre: {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+#, fuzzy
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
+msgstr ""
+"K zapnutiu cadastre WMS pluginu, zmeňte\n"
+"projekciu na Lambert a reštartujte JOSM"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9653,5 +9630,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr "Nastaviť WMS"
@@ -10384,22 +10361,27 @@
 msgstr "Nemôžem získať obrázok"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr "Pripájam sa"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr "Pripojené"
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr "Nepripojený"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr "Spojenie zlyhalo"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "meno"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10432,32 +10414,32 @@
 msgstr "LiveGPS layer"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
 msgstr "Nahrať GPS Stopu"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr "Pripojiť to gpsd server a ukázať aktuálnu polohu v LiveGPS vrstve."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center Once"
 msgstr "Vycentrovať (Center Once)"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center the LiveGPS layer to current position."
 msgstr "Stred LiveGPS vrstvy v aktuálnej polohe."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr "Automatický stred (Auto-Center)"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Nepretržite stred LiveGPS vrstvy do aktuálnej polohy"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -10707,24 +10689,24 @@
 msgstr "Povolené činnosti"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Vzdialená kontrola požiadala o načítanie dát z API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detaily požiadavky: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr "Chcete toto povoliť?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr "Potvrdiť činnosť vzdialenej kontroly"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Vzdialená kontrola požiadala o import dát z nasledujúcej URL:"
@@ -10965,10 +10947,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
+#, fuzzy, java-format
+msgid "{0} start"
 msgstr "začiatok (start)"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr "koniec (end)"
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} bod"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11512,10 +11496,10 @@
 msgstr "Zkrížené cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr "Duplicitné body"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Tento test zisťuje či nie je viac bodov na jednom mieste."
@@ -12214,9 +12198,33 @@
 msgstr "Neplatná WMS URL alebo id"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr "Nastavte polohu vybratej WMS vrstvy"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "Prosím vyberte riadok na úpravu."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "Uložiť WMS vrstvu"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Start adjusting"
+msgstr "Začať trasovanie"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "Žiadne zmeny pre uloženie."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -12232,15 +12240,15 @@
 msgstr "Automatické sťahovanie"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS vrstva ({0}), sa automaticky sťahuje vo zväčšení (zoom) {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS vrstva ({0}), sťahovaná vo zväčšení (zoom) {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12248,42 +12256,42 @@
 "Požadovaná oblasť je príliš veľká. Prosím priblížte ju, alebo zmente oblasť."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Stiahnuť viditeľné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Zmena rozlíšenia"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Nahrať poškodené dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Alfa kanál"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Uložiť WMS vrstvu do súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr "Uložiť WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "Nahrať WMS vrstvu zo súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr "Načítať WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Nepodporovaná verzia WMS súboru; nájdené {0}, očakávané {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Chyba formátu súboru"
@@ -12918,5 +12926,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -15481,5 +15489,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15781,5 +15789,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15882,5 +15890,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -20511,7 +20519,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "Cesta pre motorové vozidlá"
+msgstr ""
 
 #. color tertiary
@@ -23690,5 +23697,5 @@
 msgstr "Dedina/Mesto"
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23699,5 +23706,5 @@
 msgstr "Jednosmerka"
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23707,5 +23714,5 @@
 msgstr "Kostol"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23716,5 +23723,5 @@
 msgstr "Čerpacia stanica"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23725,5 +23732,5 @@
 msgstr "Nakupovanie"
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23733,5 +23740,5 @@
 msgstr "WC"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23964,53 +23971,28 @@
 msgstr "Terraserver Urban"
 
-#~ 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 "API initialization failed"
-#~ msgstr "API inicializácia neúspešná"
-
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
+#~ "Failed to access system property ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
 #~ msgstr ""
-#~ "Žiadne údaje pre uloženie sú nenájdené. Máte otvorenú, alebo načítanú "
-#~ "údajovú vrstvu?"
-
-#~ msgid "No data"
-#~ msgstr "Žiadne dáta"
-
-#~ msgid "Failed to update the selected primitives."
-#~ msgstr "Chyba pri aktualizácii vybraných pôvodných."
-
-#~ msgid "Update failed"
-#~ msgstr "Aktualizácia neúspešná"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Chýbajúce pôvodné"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Použiť čiastočné rozhodnutie"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Vrstvy: {0}"
-
-#~ msgid "Conflict created"
-#~ msgstr "Konflikt je vytvorený"
-
-#~ 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 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 "Validate"
-#~ msgstr "Overiť"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Overovať konkrétny výber, alebo kompletnú dátovu sadu."
+#~ "Neúspešný  prístup k systémovej vlastnosti ''{0}'' z bezpečnostného "
+#~ "dôvodu. Výnimka bola: {1}"
+
+#~ msgid "Unknown file extension for file ''{0}''"
+#~ msgstr "Neznáme rozšírenie súboru pre súbor ''{0}''"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Neznáma prípona súboru"
+
+#~ msgid "Move"
+#~ msgstr "Presunúť"
+
+#~ msgid "Invalid projection"
+#~ msgstr "Chybná projekcia"
+
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Najskôr zmente projekciu na {0}."
+
+#~ msgid "end"
+#~ msgstr "koniec (end)"
 
 #~ msgid "Not implemented yet."
@@ -24089,4 +24071,7 @@
 #~ "histórie."
 
+#~ msgid "Layers: {0}"
+#~ msgstr "Vrstvy: {0}"
+
 #~ msgid "Login name (email) to the OSM account."
 #~ msgstr "Prihlasovacie meno (email) k OSM účtu."
@@ -24139,4 +24124,10 @@
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "Naozaj označiť tento problém ako \"hotový\"?"
+
+#~ msgid "Validate"
+#~ msgstr "Overiť"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Overovať konkrétny výber, alebo kompletnú dátovu sadu."
 
 #~ msgid "viaduct"
@@ -24290,4 +24281,7 @@
 #~ 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 "
@@ -24396,7 +24390,4 @@
 #~ "eg. vymazaním nezaujímavých častí stopy (track)"
 
-#~ msgid "Start routing"
-#~ msgstr "Začať trasovanie"
-
 #~ msgid "Remove route nodes"
 #~ msgstr "Odstrániť trasové body"
@@ -24413,4 +24404,11 @@
 #~ msgid "Some of the nodes are (almost) in the line"
 #~ msgstr "Niektoré z bodov sú (skoro) na priamke"
+
+#~ 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 "Data Layer"
@@ -24450,4 +24448,11 @@
 #~ msgstr "OSM používateľské meno (email)"
 
+#~ 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 "Image with path {0} does not exist or is not readable."
 #~ msgstr "Obrázok na ceste {0} neexistuje alebo sa neda prečítať."
@@ -24468,4 +24473,7 @@
 #~ msgstr "Vyriešte rozpor v poradovom čísle relácie {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 "
@@ -24485,4 +24493,10 @@
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Kontrolujem či sú závislosti {0} is gone ..."
+
+#~ 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 ""
@@ -24514,4 +24528,7 @@
 #~ msgstr "Výber je príliš veľký"
 
+#~ msgid "Missing primitive"
+#~ msgstr "Chýbajúce pôvodné"
+
 #~ 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"
@@ -24520,4 +24537,10 @@
 #~ msgstr "Chyba počas komunikácie so serverom"
 
+#~ 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 "API initialization failed"
+#~ msgstr "API inicializácia neúspešná"
+
 #~ msgid "image loading..."
 #~ msgstr "nahrávam obrázok..."
@@ -24537,2 +24560,8 @@
 #~ msgid "Members: {0} (linked: {1})"
 #~ msgstr "Členy: {0} (spojenie: {1})"
+
+#~ msgid "No data"
+#~ msgstr "Žiadne dáta"
+
+#~ msgid "Conflict created"
+#~ msgstr "Konflikt je vytvorený"
Index: /applications/editors/josm/i18n/po/sl.po
===================================================================
--- /applications/editors/josm/i18n/po/sl.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/sl.po	(revision 16973)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-07-25 18:57+0000\n"
-"Last-Translator: Štefan Baebler <Unknown>\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-04 10:40+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,6 @@
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:33+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -48,15 +41,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -81,7 +66,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -89,4 +74,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -108,8 +97,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Napaka"
@@ -122,5 +113,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Neshranjene spremembe"
@@ -140,16 +131,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -161,13 +151,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -184,4 +175,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "Prekliči"
@@ -195,5 +187,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -202,5 +194,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -211,23 +204,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -248,5 +241,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Pozor"
@@ -280,5 +273,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -311,5 +304,5 @@
 msgstr "Prijava napak"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -370,19 +363,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Prosim izberite vrstico za izbris."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Izberite bodisi:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "Združi vozlišča"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -421,5 +411,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -452,18 +442,18 @@
 msgstr "Z. dolžina"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Razporedi vozliša v krog"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Premakne izbrana vozlišča tako, da tvorijo krog."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -492,18 +482,18 @@
 msgstr "Orodje: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Prosim, izberite vsaj 4 vozlišča."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -516,5 +506,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -637,13 +627,13 @@
 msgstr "Združi več poti v eno samo."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "Združim poti z različnim članstvom?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -651,13 +641,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Obrnem smeri?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -665,9 +655,9 @@
 msgstr "Poti v trenutnih smereh ni mogoče združiti. Obrnem nekatere od njih?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Obrni in združi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -676,5 +666,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -682,14 +672,14 @@
 msgstr "Razreši neskladja"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Združi {0} poti"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "Vse poti so bile prazne"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -706,24 +696,23 @@
 msgstr "Kopiraj izbrane predmete v odložišče"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Izberite predmete, ki jih želite kopirati."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Ustvari krog"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Skozi izbrana tri vozlišča ustvari krog"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "Izbrana vozlišča niso v krogu."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -735,8 +724,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -756,15 +745,15 @@
 msgstr "Izbriši izbrane predmete."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Prepiši"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "Datoteka obstaja. Jo nadomestim?"
@@ -825,5 +814,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -833,7 +822,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "Napake pri sprejemu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -844,5 +832,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Podvoji"
@@ -866,92 +855,36 @@
 msgstr "Zaključek dela z aplikacijo."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Opomba: GPL ni združljiv z licenco OSM. Ne pošiljajte GPS sledi z licenco "
-"GPL."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Izvoz v GPX ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Izvoz v datoteko oblike GPX."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "Opis GPS sledi"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Dodaj podatke o avtorstvu"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Resnično ime"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr "E-poštni naslov"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Avtorske pravice (URL)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Preddoločen"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "Leto avtorskih pravic"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Ključne besede"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Možnosti izvoza"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "Izvozi in shrani"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Napaka pri izvozu {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Izberite preddoločeno licenco"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "Izvoz v datoteko oblike GPX."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -967,6 +900,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1037,5 +970,5 @@
 msgstr "Vključi izbrano vozlišče v najbližji del poti"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "Priključi vozlišče v pot"
@@ -1046,12 +979,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Vseeno združi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "Združi izbrano plast s plastjo pod njo."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1093,12 +1024,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "izbor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Pomakni izbranega člana vrstico nižje."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1158,5 +1087,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "Nova"
@@ -1247,5 +1176,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Prilepi"
@@ -1257,5 +1186,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Prilepi oznake"
@@ -1302,7 +1231,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Preimenovanje datoteke \"{0}\" ni uspelo."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1339,5 +1268,10 @@
 msgstr "Datoteka {0} že obstaja. Jo prepišem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "Dokument ni odprt, zato ni kaj shraniti."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1345,25 +1279,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "Dokument ni odprt, zato ni kaj shraniti."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Prazen dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "Dokument ne vsebuje podatkov."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "Vseeno shrani"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "V sporu z"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1371,56 +1305,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "Zavrži spremembe in shrani"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "Shrani datoteko OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "Shrani datoteko GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Nastavitev ni bilo mogoče prenesti. Razlog: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Neznana končnica datoteke: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Neznana končnica datoteke."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "V vstavku {0} je prišlo do napake"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
 msgstr ""
 
@@ -1535,5 +1431,5 @@
 "sredini poti.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1541,5 +1437,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1547,5 +1443,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1790,7 +1686,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "Pošlji vse spremembe na strežnik OSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1948,7 +1843,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "Pošiljanje podatkov"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
@@ -1993,5 +1887,5 @@
 msgstr "Način: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -1999,6 +1893,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2009,8 +1903,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2055,38 +1949,38 @@
 msgstr "izbrano"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "Ni mogoče dodati vozlišča izven tega sveta."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Dodaj vozlišče"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Dodaj vozlišče v pot"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "Poveži obstoječo pot z vozliščem"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Dodaj novo vozlišče v pot"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "Dodaj in poveži vozlišče v pot"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "Ustvari novo vozlišče."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "Izberi vozlišče pod kazalcem miške."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2097,14 +1991,14 @@
 msgstr[3] "Vstavi novo vozlišče v {0} poti."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "Začni novo pot od zadnjega vozlišča"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "Nadaljuj pot od zadnjega vozlišča."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "Zaključi risanje."
@@ -2124,5 +2018,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Za izbor predmetov v pravokotniku izpustite miškin gumb."
@@ -2133,5 +2027,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "Za prenehanje vrtenja izpustite miškin gumb."
@@ -2166,9 +2060,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr "Premakni elemente"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2181,13 +2075,13 @@
 "Naj jih zares premaknem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr "Premakni jih"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr "Razveljavi premik"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2196,5 +2090,5 @@
 "najbližjo točko."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2408,26 +2302,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2436,5 +2330,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2526,8 +2420,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Razreši neskladja"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2544,5 +2437,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2586,5 +2479,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr ""
@@ -2597,5 +2490,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr ""
@@ -2603,5 +2496,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2610,8 +2504,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "Informacije"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2621,9 +2514,225 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Premakni"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "Združi {0} vozlišč"
+msgstr[1] "Združi {0} vozlišč"
+msgstr[2] "Združi {0} vozlišč"
+msgstr[3] "Združi {0} vozlišč"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "Zasuči {0} {1}"
+msgstr[1] "Zasuči {0} {1}"
+msgstr[2] "Zasuči {0} {1}"
+msgstr[3] "Zasuči {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Zaporedje"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Uveljavim?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Relacija"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Stara vloga"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "Nova vloga"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Star ključ"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Stara vrednost"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Nov ključ"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "Nova vrednost"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Uveljavi izbrane spremembe"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Ne uveljavi sprememb"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Lastnosti "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Samodejno popravljanje oznak"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Ni možno odpreti imenika z nastavitvami: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Nastavitve shranjene na {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Nastavitev ni bilo mogoče prenesti. Razlog: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "Decimalne stopinje"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "Stopinje Minute Sekunde"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "J"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "Z"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "V"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "Spremeni {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "nepopoln"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2639,208 +2748,4 @@
 msgstr[3] "vozlišča"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr "Zasuči {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Zaporedje"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Uveljavim?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "Relacija"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "Stara vloga"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "Nova vloga"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Star ključ"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Stara vrednost"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Nov ključ"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "Nova vrednost"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "Uveljavi izbrane spremembe"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "Ne uveljavi sprememb"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "Lastnosti "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "Samodejno popravljanje oznak"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Ni možno odpreti imenika z nastavitvami: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Nastavitve shranjene na {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Nastavitev ni bilo mogoče prenesti. Razlog: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "Decimalne stopinje"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "Stopinje Minute Sekunde"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "J"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "Z"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "V"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "nepopoln"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2874,5 +2779,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2907,5 +2812,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -2916,22 +2821,22 @@
 msgstr[3] "{0} člani"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "cesta"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "železnica"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "vodotok"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "raba tal"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -2998,10 +2903,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3009,5 +2916,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3015,57 +2922,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Neznana vloga ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3117,5 +3024,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3149,4 +3056,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3181,13 +3092,25 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "Zaznamkov ni bilo mogoče prebrati."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "Zaznamka ni bilo mogoče zapisati."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3220,4 +3143,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3249,16 +3173,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "Nepričakovana napaka"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
 msgstr ""
-"Ni se bilo mogoče povezati s strežnikom OSM. Preverite vašo povezavo z "
-"internetom."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3479,6 +3400,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3507,39 +3428,39 @@
 msgstr "Zvok"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "Premakni desno"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Zemljevid: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "Premakni levo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Premakni navzgor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Premakni navzdol"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "Povečaj"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Pomanjšaj"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr ""
@@ -3573,10 +3494,10 @@
 msgstr "(ni predmeta)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "plasti ni na seznamu."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3658,12 +3579,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Lastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3672,6 +3593,6 @@
 msgstr "Oznake"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3679,47 +3600,47 @@
 msgstr "Vozlišča"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Člani"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#, java-format
+msgid "{0} pending tag conflicts to be resolved"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
-#, java-format
-msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3727,25 +3648,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Odpravljanje sporov"
@@ -3945,8 +3866,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4165,5 +4086,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4176,5 +4097,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4209,6 +4130,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4221,6 +4142,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4291,7 +4212,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4354,7 +4275,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Vseeno shrani"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4381,7 +4301,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Razreši spore"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4430,98 +4350,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Plasti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Odpri seznam vseh naloženih plasti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Izbriši izbrano plast."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "Imate neshranjene spremembe. Vseeno izbrišem plast?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "Ali res želite izbrisati celotno plast?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Informacije"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "da"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Izbriši"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "Izbriši {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Prikaži/skrij"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Preklopi vidljivost izbrane plasti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "Izbriši izbrano plast."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "Združi izbrano plast s plastjo pod njo."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Pomakni izbrano plast vrstico višje."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Pomakni izbrano plast vrstico nižje."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "Informacije"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4532,22 +4446,22 @@
 msgstr[3] "Spremenili boste do {0} predmete."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "Prazna vrednost izbriše ključ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<različno>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Sprememba vrednosti?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4555,5 +4469,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4564,49 +4478,40 @@
 msgstr[3] "Spremeni lastnosti do {0} predmetov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Izberite ključ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Izberite vrednost"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "Lastnosti/Članstva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Lastnosti izbranih predmetov"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "Spremeni relacijo"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "Naj res izbrišem izbor iz relacije {0}?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4623,63 +4528,77 @@
 msgstr "Dodaj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Add a new key/value pair to all objects"
 msgstr "Dodaj nov par ključ/vrednost vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 msgid "Edit the value of the selected key for all objects"
 msgstr "Spremeni vrednost izbranega ključa vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636
-msgid "Delete Properties"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Latnosti: {0} / Članstva: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "Lastnosti / Članstva"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "Spremeni relacijo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "Naj res izbrišem izbor iz relacije {0}?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
 msgid "Delete the selected key in all objects"
 msgstr "Izbriši izbrani ključ vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Latnosti: {0} / Članstva: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "Lastnosti / Članstva"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+msgid "Delete Properties"
+msgstr ""
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Relacije"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "Odpri seznam vseh relacij."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Odpri urejevalnik za izbrano relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Izbriši izbrano relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Ustvari novo relacijo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4710,5 +4629,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4776,5 +4695,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -4785,21 +4704,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "Sprejmi področje"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "Izbriši izbrano relacijo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Naloži vidne ploščice"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr ""
@@ -4818,17 +4734,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "Relacije"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "Sprejem podatkov"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -4846,7 +4761,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "Relacije"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -4857,9 +4771,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -4868,15 +4782,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "Znova uveljavi zadnje razveljavljeno dejanje."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -4886,9 +4799,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -4898,15 +4811,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -4914,5 +4827,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -4920,64 +4833,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
+#, fuzzy
+msgid "Select primitives for selected relation members"
+msgstr "Izbriši izbrano relacijo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "Pomakni izbranega člana vrstico višje."
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "Pomakni izbranega člana vrstico nižje."
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Pomakni izbranega člana vrstico nižje."
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "Izbriši izbrano relacijo"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -4986,10 +4915,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "Spor"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -4998,21 +4926,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Shrani trenutne podatke"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5022,37 +4949,37 @@
 msgstr "V redu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Sprejmi vse nepopolne poti in vozlišča v relaciji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5062,30 +4989,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Zmanjšaj"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "Pomakni izbranega člana vrstico nižje."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5146,7 +5067,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "Naloži izbrano"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -5180,7 +5100,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "dodaj v izbor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6312,5 +6231,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Slike z geografskim položajem"
@@ -6336,5 +6255,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6355,5 +6274,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "Slike JPEG (*.jpg)"
@@ -6391,43 +6310,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "točka GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Riši povezave med točkami na tej plasti."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Ne riši povezav med točkami na tej plasti."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Prilagodi barvo"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6435,6 +6354,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6508,10 +6427,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Pretvori v podatkovno plast"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6520,11 +6439,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6533,29 +6452,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr "Sprejmi iz OSM vzdolž te sledi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "Sprejmi vse znotraj:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6566,9 +6485,9 @@
 "nadaljevati?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6576,5 +6495,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6624,5 +6543,5 @@
 msgstr "Pretvori v plast GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6649,5 +6568,5 @@
 msgstr[3] "sledi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6657,5 +6576,5 @@
 msgstr[3] "točke"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6666,5 +6585,5 @@
 msgstr[3] "sled z {0} točkami"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6673,5 +6592,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6682,9 +6601,9 @@
 msgstr[3] "{0} točke"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6692,5 +6611,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6699,14 +6618,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 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:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6714,14 +6633,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6729,13 +6648,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Prikaži/skrij besedilo/ikone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
@@ -7730,7 +7649,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -7804,4 +7723,9 @@
 msgstr "Pripravljam podatke..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "Ni bilo možno prebrati \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -7813,7 +7737,69 @@
 msgstr "Ni bilo možno prebrati \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Opomba: GPL ni združljiv z licenco OSM. Ne pošiljajte GPS sledi z licenco "
+"GPL."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "Opis GPS sledi"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Dodaj podatke o avtorstvu"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Resnično ime"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr "E-poštni naslov"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Avtorske pravice (URL)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Preddoločen"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "Leto avtorskih pravic"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Ključne besede"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Možnosti izvoza"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "Izvozi in shrani"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Napaka pri izvozu {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Izberite preddoločeno licenco"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -7841,4 +7827,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Neznana vloga ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -7971,7 +7962,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "Spremeni {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -7986,4 +7977,5 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8015,4 +8007,32 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8070,30 +8090,26 @@
 msgstr "Napaka med razčlenjevanjem."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Neznana različica"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr ""
@@ -8143,5 +8159,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8150,9 +8166,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "Spremeni vlogo člana relacije pri {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "Priprava podatkov OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "Neveljaven id točke"
@@ -8368,7 +8389,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "Informacij o vsavku ni bilo mogoče najti."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8745,23 +8765,23 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr ""
 
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
+msgid "Open images with AgPifoJ..."
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
-msgid "Open images with AgPifoJ..."
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9000,5 +9020,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr ""
@@ -9045,28 +9065,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the JOSM projection to Lambert and restart"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9075,9 +9080,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
@@ -9237,12 +9242,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
 msgstr ""
 
@@ -9310,5 +9322,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr ""
@@ -10019,22 +10031,27 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr ""
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "brez"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10067,33 +10084,33 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
 msgstr "Zajemi GPS sled"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 "Povezava s strežnikom gpsd in prikaz trenutnega položaja na plasti LiveGPS."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center Once"
 msgstr "Centriraj zdaj"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center the LiveGPS layer to current position."
 msgstr "Centiraj plast LiveGPS na trenuten položaj."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr "Samodejno centriraj"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Nenehno centriraj plast LiveGPS na trenutni položaj."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr ""
@@ -10329,24 +10346,24 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -10585,10 +10602,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
+#, java-format
+msgid "{0} start"
 msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr ""
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} točk"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11111,10 +11130,10 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr "Podvojena vozlišča"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
@@ -11773,9 +11792,32 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "Prosim izberite vrstico za urejanje."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "Plast WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+msgid "Start adjusting"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "Ni sprememb za pošiljanje."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11788,57 +11830,57 @@
 msgstr "Samodejno sprejemanje"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Naloži vidne ploščice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Spremeni ločljivost"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Shrani plast WMS v datoteko"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "Naloži plast WMS iz datoteke"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Nepodprta različica datoteke WMS; našel {0}, pričakoval {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr ""
@@ -12420,5 +12462,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -14975,5 +15017,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15275,5 +15317,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15376,5 +15418,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -23178,5 +23220,5 @@
 msgstr ""
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23187,5 +23229,5 @@
 msgstr ""
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23195,5 +23237,5 @@
 msgstr ""
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23204,5 +23246,5 @@
 msgstr ""
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23213,5 +23255,5 @@
 msgstr ""
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23221,5 +23263,5 @@
 msgstr ""
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23452,9 +23494,110 @@
 msgstr ""
 
-#~ msgid "No data"
-#~ msgstr "Ni podatkov"
-
-#~ msgid "Update failed"
-#~ msgstr "Posodobitev ni uspela"
+#~ msgid "Unknown file extension."
+#~ msgstr "Neznana končnica datoteke."
+
+#~ msgid "Move"
+#~ msgstr "Premakni"
+
+#~ msgid "Data Layer"
+#~ msgstr "Podatkovna plast"
+
+#~ msgid "their version:"
+#~ msgstr "njihova različica:"
+
+#~ msgid "resolved version:"
+#~ msgstr "končna različica:"
+
+#~ msgid "my version:"
+#~ msgstr "moja različica:"
+
+#~ msgid "Object"
+#~ msgstr "Predmet"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} objektov s konflikti:"
+#~ msgstr[1] "{0} objekt s konfliktom:"
+#~ msgstr[2] "{0} objekta s konflikti:"
+#~ msgstr[3] "{0} objekti s konflikti:"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Uporabniško ime (email) vašega računa pri OSM."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM uporabniško ime (email)"
+
+#~ msgid "Aborting..."
+#~ msgstr "Prekinjanje ..."
+
+#~ msgid "position"
+#~ msgstr "položaj"
+
+#~ msgid "different"
+#~ msgstr "različno"
+
+#~ msgid "false"
+#~ msgstr "napačno"
+
+#~ msgid "true"
+#~ msgstr "pravilno"
+
+#~ msgid "Change"
+#~ msgstr "Spremeni"
+
+#~ msgid "Not implemented yet."
+#~ msgstr "Še ni podprto."
+
+#~ msgid "Email"
+#~ msgstr "E-pošta"
+
+#~ msgid "unnamed"
+#~ msgstr "neimenovano"
+
+#~ msgid "Resolve {0} conflicts in {1} objects"
+#~ msgstr "Razreši {0} sporov v {1} predmetih"
+
+#~ msgid "Adjust the position of the WMS layer"
+#~ msgstr "Prilagodi položaj plasti WMS"
+
+#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
+#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
+#~ msgstr[0] "{0} vsavkov uspešno posodobljenih. Ponovno zaženite JOSM."
+#~ msgstr[1] "{0} vsavek uspešno posodobljen. Ponovno zaženite JOSM."
+#~ msgstr[2] "{0} vsavka uspešno posodobljena. Ponovno zaženite JOSM."
+#~ msgstr[3] "{0} vsavki uspešno posodobljeni. Ponovno zaženite JOSM."
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Sprejem vstavka {0} z naslova {1} ni bil mogoč"
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Za premikanje in povečavo lahko uporabite miško ali <ctrl>+<smerne tipke>."
+
+#~ msgid ""
+#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
+#~ "move mouse.   Select: Click."
+#~ msgstr ""
+#~ "Povečava: Miškino kolesce ali dvojni klik. Premik: Desni miškin gumb in "
+#~ "premik. Izbor: Kliknite z miško in povlecite"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Preveri pravilnost vseh podatkov ali samo izbora."
+
+#~ msgid "Validate"
+#~ msgstr "Preveri"
+
+#~ msgid "image not loaded"
+#~ msgstr "slika ni naložena"
+
+#~ msgid "Rotate"
+#~ msgstr "Zasuk"
+
+#~ msgid ""
+#~ "The plugin {0} seems to be broken or could not be downloaded "
+#~ "automatically."
+#~ msgstr ""
+#~ "Vstavek {0} izgleda pokvarjen, ali pa ga ni bilo mogoče samodejno "
+#~ "sprejeti."
 
 #~ msgid "Layers: {0}"
@@ -23467,105 +23610,4 @@
 #~ "Vstavka ni bilo mogoče odstraniti. Prosimo. povejte to ljudem od katerih "
 #~ "ste dobili JOSM."
-
-#~ msgid "Validate"
-#~ msgstr "Preveri"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Preveri pravilnost vseh podatkov ali samo izbora."
-
-#~ msgid "Data Layer"
-#~ msgstr "Podatkovna plast"
-
-#~ msgid "their version:"
-#~ msgstr "njihova različica:"
-
-#~ msgid "resolved version:"
-#~ msgstr "končna različica:"
-
-#~ msgid "my version:"
-#~ msgstr "moja različica:"
-
-#~ msgid "Object"
-#~ msgstr "Predmet"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} objektov s konflikti:"
-#~ msgstr[1] "{0} objekt s konfliktom:"
-#~ msgstr[2] "{0} objekta s konflikti:"
-#~ msgstr[3] "{0} objekti s konflikti:"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Uporabniško ime (email) vašega računa pri OSM."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM uporabniško ime (email)"
-
-#~ msgid "Aborting..."
-#~ msgstr "Prekinjanje ..."
-
-#~ msgid "position"
-#~ msgstr "položaj"
-
-#~ msgid "different"
-#~ msgstr "različno"
-
-#~ msgid "false"
-#~ msgstr "napačno"
-
-#~ msgid "true"
-#~ msgstr "pravilno"
-
-#~ msgid "Change"
-#~ msgstr "Spremeni"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Še ni podprto."
-
-#~ msgid "Email"
-#~ msgstr "E-pošta"
-
-#~ msgid "unnamed"
-#~ msgstr "neimenovano"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Razreši {0} sporov v {1} predmetih"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Prilagodi položaj plasti WMS"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} vsavkov uspešno posodobljenih. Ponovno zaženite JOSM."
-#~ msgstr[1] "{0} vsavek uspešno posodobljen. Ponovno zaženite JOSM."
-#~ msgstr[2] "{0} vsavka uspešno posodobljena. Ponovno zaženite JOSM."
-#~ msgstr[3] "{0} vsavki uspešno posodobljeni. Ponovno zaženite JOSM."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Sprejem vstavka {0} z naslova {1} ni bil mogoč"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Za premikanje in povečavo lahko uporabite miško ali <ctrl>+<smerne tipke>."
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Povečava: Miškino kolesce ali dvojni klik. Premik: Desni miškin gumb in "
-#~ "premik. Izbor: Kliknite z miško in povlecite"
-
-#~ msgid "image not loaded"
-#~ msgstr "slika ni naložena"
-
-#~ msgid "Rotate"
-#~ msgstr "Zasuk"
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "Vstavek {0} izgleda pokvarjen, ali pa ga ni bilo mogoče samodejno "
-#~ "sprejeti."
 
 #~ msgid "Error deleting plugin file: {0}"
@@ -23614,2 +23656,8 @@
 #~ msgid "Edit Portcullis"
 #~ msgstr "Uredi dók"
+
+#~ msgid "No data"
+#~ msgstr "Ni podatkov"
+
+#~ msgid "Update failed"
+#~ msgstr "Posodobitev ni uspela"
Index: /applications/editors/josm/i18n/po/sv.po
===================================================================
--- /applications/editors/josm/i18n/po/sv.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/sv.po	(revision 16973)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-07-27 07:18+0000\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-04 10:57+0000\n"
 "Last-Translator: Konrad Skeri <konrad@skeri.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -16,13 +16,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:33+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -47,15 +40,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -80,7 +65,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -88,4 +73,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -107,8 +96,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Fel"
@@ -120,5 +111,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Osparade ändringar"
@@ -138,16 +129,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -159,13 +149,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -182,4 +173,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "Avbryt"
@@ -193,5 +185,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -200,5 +192,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -209,23 +202,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -246,5 +239,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Varning"
@@ -278,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -309,5 +302,5 @@
 msgstr "Buggrapporter"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -372,19 +365,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Välj vilken rad du vill ta bort."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Välj antingen:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "Slå ihop noder"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -423,5 +413,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -454,18 +444,18 @@
 msgstr "Longitud"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Bilda en cirkel av noderna"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Flytta de valda noderna in i en cirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -494,18 +484,18 @@
 msgstr "Verktyg: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Välj åtminstone fyra noder."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -518,5 +508,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -646,13 +636,13 @@
 msgstr "Förena flera sträckor till en enda."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Välj åtminstone två sträckor att slå ihop"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "Slå ihop sträckor med olika roller?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -661,13 +651,13 @@
 "De valda sträckorna har olika roller i relationen. Vill du ändå slå ihop dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "Slå ihop i alla fall"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Ändra riktning?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -677,9 +667,9 @@
 "några av dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "Byt riktning och slå ihop"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -688,5 +678,5 @@
 msgstr "Ange värden för alla konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -694,14 +684,14 @@
 msgstr "Jämka konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Slå ihop {0} sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "Alla sträckor var tomma"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -720,24 +710,23 @@
 msgstr "Kopiera valda objekt till inklistringsbuffern."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Välj någonting att kopiera."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Skapa cirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Skapa en cirkel av tre valda noder."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "De noderna är inte i en cirkel."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -751,8 +740,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -772,15 +761,15 @@
 msgstr "Ta bort valda objekt."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Skriv över"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "Filen existerar redan. Vill du skriva över?"
@@ -841,5 +830,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -849,7 +838,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "Fel under nedladdning"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -860,5 +848,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Duplicera"
@@ -882,92 +871,36 @@
 msgstr "Avsluta programmet."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Obs: GPL är inte kompatibelt med OSM-licensen. Skicka inte in spår under GPL-"
-"licens."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Exportera till GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Exportera data till en GPX-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Det finns inte något att exportera. Skaffa lite data först."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr "parametern ''{0}'' får inte vara null"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr "förväntade instans av OsmDataLayer eller GpxLayer. Erhöll \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "beskrivning av gps-spår"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Lägg till information om upphovsman"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "Namn"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr "E-mail"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Copyright (URL)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Fördefinierad"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "Copyrightår"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Nyckelord"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Exportalternativ"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "Exportera och spara"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Fel vid export av {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Välj en fördefinierad licens"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "Exportera data till en GPX-fil"
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -983,6 +916,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1055,5 +988,5 @@
 msgstr "Anslut en nod till det närmaste avsnittet av en sträcka"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "Förena nod och linje"
@@ -1064,12 +997,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Slå ihop i alla fall"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "Slå ihop det lager som finns precis under med det valda lagret."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1114,12 +1045,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "urval"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Uppdatera markerade primitiv från servern"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1179,5 +1108,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "Ny"
@@ -1252,5 +1181,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
-#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1258,8 +1186,4 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 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?"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1273,5 +1197,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Klistra in"
@@ -1283,5 +1207,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Klistra in taggar"
@@ -1330,7 +1254,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Kunde inte byta namn på filen \"{0}\"."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1367,5 +1291,10 @@
 msgstr "Fil {0} existerar redan. Skriv över?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "Inga tvärsnitt hittades. Ingenting har ändrats."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1375,26 +1304,26 @@
 "in detta som ett fel."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr ""
 "Det finns inte något öppet dokument, så det finns inte något att spara."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Tomt dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "Dokumentet innehåller inte någon data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "Spara i alla fall"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1404,57 +1333,19 @@
 "som om du avvisat dem alla. Fortsätt?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "Avvisa konflikter och spara"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "Spara OSM-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "Spara GPX-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "Spara Lager"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Kunde inte backa upp filen."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Okänt filformat: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr "Det uppstod ett fel när filen skulle sparas."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr "Det uppstod ett fel när backup-filen skulle återställas."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Okänd filändelse."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "Det uppstod ett fel när filen skulle sparas."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr "Det uppstod ett fel när backup-filen skulle återställas."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1568,23 +1459,17 @@
 "sträckan.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
 "should verify this and correct it when necessary.</html>"
 msgstr ""
-"Ett rollbaserat relationsmedlemskap kopierades till alla nya sträckor.\n"
-"Du bör kontrollera detta och rätta till eventuella fel."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
-#, fuzzy
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
 "this and correct it when necessary.</html>"
 msgstr ""
-"Medlemskap i relationer kopierades till alla nya vägar.\n"
-"Du bör verifiera att detta är korrekt."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1727,12 +1612,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
-#, fuzzy
 msgid "No current dataset found"
-msgstr "Inget GPX-datalager kunde hittas."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
-#, fuzzy
 msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr "Kunde inte hitta primitiv med id {0} i nuvarande dataset"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
@@ -1847,7 +1730,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "Skicka in alla ändringar till OSM-servern."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -2005,12 +1887,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "Skickar data"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr "Följande fel inträffade under massnedladdning:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -2055,5 +1936,5 @@
 msgstr "Läge: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2063,6 +1944,6 @@
 "noder vid borttagning av sträcka. Ctrl: ta bort objekt som refererar hit"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2073,8 +1954,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2119,38 +2000,38 @@
 msgstr "markerad"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "Det går inte att lägga till en nod utanför världen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Lägg till nod"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Lägg till en nod till sträckan"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "Knyt en existerande nod till en sträcka"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Lägg till en ny nod i en befintlig sträcka"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "Lägg till en nod i en sträcka och bind ihop"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "Skapa ny nod"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "Markera nod under pekare."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2159,14 +2040,14 @@
 msgstr[1] "Infoga ny nod i {0} vägar."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "Starta ny väg från senaste nod."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "Fortsätt väg från senaste nod."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "Avsluta ritning."
@@ -2186,5 +2067,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Släpp musknappen för att välja objekten i rektangeln."
@@ -2195,5 +2076,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "Släpp musknappen för att sluta rotera."
@@ -2230,9 +2111,9 @@
 msgstr[1] "Lägg till och flytta en virtuell ny nod till {0} vägar."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr "Flytta element"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2245,13 +2126,13 @@
 "Vill du verkligen flytta på dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr "Flytta"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr "Ångra flytt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2260,5 +2141,5 @@
 "nod."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2488,26 +2369,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr "Det saknas argument för eller (or)."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr "Det saknas argument för inte (not)."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "En avslutande parentes förväntades"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Felaktigt antal parametrar för nodoperator."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2516,5 +2397,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2604,8 +2485,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Jämka konflikt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2617,10 +2497,10 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "Inga sökträffar för ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2666,5 +2546,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "Ta bort från relation"
@@ -2679,5 +2559,5 @@
 "Ta bort från relationen?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr "Dela delsträcka"
@@ -2685,5 +2565,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2695,8 +2576,7 @@
 "använder dem.<br> Vill du verkligen ta bort dem?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "Ta bort från relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2706,9 +2586,223 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Flytta"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "Slå ihop {0} noder"
+msgstr[1] "Slå ihop {0} noder"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr "raderar referens från relation {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr "Radera relationsmedlem {0} {1}"
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "Rotera {0} {1}"
+msgstr[1] "Rotera {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Sekvens"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "Lös {0} taggninskonfliker i {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr "Ångra radering av {0} primitiv"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr "Lös versionskonfliker för {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr "Lös konflikter i nodlistan för väg {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Tillämpa?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"Vid riktningsbyte på denna sträcka, så föreslås följande egenskaper hos "
+"sträckan och dess noder ändras så att dataintegriteten inte komprometteras."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Relation"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Gammal roll"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "Ny roll"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Gammal nyckel"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Gammalt värde"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Ny nyckel"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "Nytt värde"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Verkställ valda ändringar"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Verkställ inte ändringar"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "Välj vilka ändringar av egenskaper som du vill genomföra."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Egenskaper för "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Automatisk taggrättning"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Fel i konfigurationsfilen på raderna {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Kan inte öppna inställningsmappen: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+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}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Inställningar lagrade på {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Kunde inte skicka in inställningar. Orsak: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "Kunde inte hämta inställningar från server."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "Decimalgrader"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "Grader Minuter Sekunder"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "N"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "V"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "Ö"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "Ändra {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr "parameter {0} > 0 krävs. Erhöll {1}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "ofullständig"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2722,210 +2816,4 @@
 msgstr[1] "noder"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr "raderar referens från relation {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr "Radera relationsmedlem {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr "Rotera {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Sekvens"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "Lös {0} taggninskonfliker i {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr "Ångra radering av {0} primitiv"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "Lös versionskonfliker för {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr "Lös konflikter i nodlistan för väg {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Tillämpa?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"Vid riktningsbyte på denna sträcka, så föreslås följande egenskaper hos "
-"sträckan och dess noder ändras så att dataintegriteten inte komprometteras."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "Relation"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "Gammal roll"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "Ny roll"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Gammal nyckel"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Gammalt värde"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Ny nyckel"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "Nytt värde"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "Verkställ valda ändringar"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "Verkställ inte ändringar"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "Välj vilka ändringar av egenskaper som du vill genomföra."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "Egenskaper för "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "Automatisk taggrättning"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Fel i konfigurationsfilen på raderna {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Kan inte öppna inställningsmappen: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-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}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Inställningar lagrade på {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Kunde inte skicka in inställningar. Orsak: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "Kunde inte hämta inställningar från server."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "Decimalgrader"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "Grader Minuter Sekunder"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "S"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "V"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "Ö"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "parameter {0} > 0 krävs. Erhöll {1}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "ofullständig"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2957,5 +2845,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2988,5 +2876,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -2995,22 +2883,22 @@
 msgstr[1] "{0} medlemmar"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "landsväg"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "järnväg"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "vattendrag"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "markanvändning"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -3075,10 +2963,12 @@
 msgstr "Multipolygonsträckan ''{0}'' är inte sluten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "Tom medlem i relationen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3086,5 +2976,5 @@
 msgstr "Tog bort medlemmen ''{0}'' i relationen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3092,57 +2982,57 @@
 msgstr "Sträcka \"{0} med mindre än två punkter."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr "Det finns mer än en \"från\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr "Det finns mer än en \"till\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr "Mer än en \"via\" hittades."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Okänd roll ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Okänd medlemstyp för ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr "Det finns inte någon \"från\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr "Det finns inte någon \"till\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr "Ingen nod eller sträcka för \"via\" hittades."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 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."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3194,5 +3084,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3226,4 +3116,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3263,13 +3157,25 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "Kunde inte läsa bokmärken."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "Kunde inte skriva bokmärken."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3308,4 +3214,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3337,15 +3244,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "Oväntat undantag"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
 msgstr ""
-"Kunde inte ansluta till osm-servern. Kontrollera din internetanslutning."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3354,5 +3259,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -3360,7 +3265,4 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-"Kunde inte upprätta anslutning till OSM servern {0}.\n"
-"Kontrollera din internetanslutning och att serverns URL är korrekt i dina "
-"inställningar."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
@@ -3580,6 +3482,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3608,39 +3510,39 @@
 msgstr "Ljud"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "Flytta höger"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Karta: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "Flytta vänster"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Flytta uppåt"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Flytta nedåt"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "Zooma in"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Zooma ut"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "skala"
@@ -3674,10 +3576,10 @@
 msgstr "(inget objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "lagret finns inte i listan."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3759,12 +3661,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3773,6 +3675,6 @@
 msgstr "Taggar"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3780,47 +3682,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Medlemmar"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#, java-format
+msgid "{0} pending tag conflicts to be resolved"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
-#, java-format
-msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3828,25 +3730,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
@@ -4046,8 +3948,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4268,5 +4170,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4279,5 +4181,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4312,6 +4214,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4324,6 +4226,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4394,7 +4296,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4458,7 +4360,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Fortsätt ändå"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4485,7 +4386,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Lös versionskonfliker för {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4534,99 +4435,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Lager"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Öppna en lista av alla inlästa lager."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Ta bort valt lager."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "Det finns osparade ändringar. Skall lagret tas bort i alla fall?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "Ta bort lager"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "Vill du verkligen ta bort hela lagret?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Information"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "ja"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "N"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Ta bort"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "Ta bort {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Visa/Dölj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Alternera visning av det valda lagret."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "privat"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "Ta bort valt lager."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "Slå ihop det lager som finns precis under med det valda lagret."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Flytta det valda lagret en rad upp."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Flytta det valda lagret en rad ner."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "Mer information om denna funktion"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4635,22 +4529,22 @@
 msgstr[1] "Detta kommer att ändra upp till {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "Om värdet är tomt tas nyckeln bort."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<olika>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Ändra värden?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4658,5 +4552,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4665,49 +4559,40 @@
 msgstr[1] "Ändra egenskaper för upp till {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Välj en nyckel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Välj ett värde"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 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/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "Egenskaper/Roller"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Egenskaper för valda objekt."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "Medlem av"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "Ändra relation"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "Verkligen ta bort det valda från relation {0}?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "Lägg till egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4724,63 +4609,77 @@
 msgstr "Lägg till"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Add a new key/value pair to all objects"
 msgstr "Lägg till ett nytt nyckel/värde-par till alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "Redigera egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 msgid "Edit the value of the selected key for all objects"
 msgstr "Redigera värdet av den valda nyckeln för alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Egenskaper: {0} / Medlemskap: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "Egenskaper / Roller"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "Ändra relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "Verkligen ta bort det valda från relation {0}?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+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/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "Ta bort egenskaper"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-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/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Egenskaper: {0} / Medlemskap: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "Egenskaper / Roller"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "Öppna en lista över alla relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relationer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Öppna en redigerare för den valda relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Ta bort den valda relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Skapa en ny relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4811,5 +4710,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4879,5 +4778,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -4888,21 +4787,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "Hämta område"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "Ta bort den valda relationen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Hämta de rutor som syns"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr ""
@@ -4921,17 +4817,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "Relationer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "Hämtar {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -4949,7 +4844,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "Relationer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -4960,9 +4854,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -4971,15 +4865,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "Tog bort element från relation"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -4989,9 +4882,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -5001,15 +4894,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5017,5 +4910,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5023,66 +4916,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
+msgid "Remove all members referring to one of the selected primitives"
+msgstr ""
+
+#. putValue(NAME, tr("Remove Selected"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Relation Editor: Remove Selected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #, fuzzy
-msgid "Remove all members referring to one of the selected primitives"
-msgstr "Misslyckades med att uppdatera markerade primitiv."
-
-#. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
-msgid "Relation Editor: Remove Selected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Select primitives for selected relation members"
+msgstr "Ta bort den valda relationen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "Flytta vald medlem/valda medlemmar uppåt"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "Flytta vald medlem/valda medlemmar nedåt"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Ta bort alla för närvarande valda objekt från relationen"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "Ta bort den valda relationen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr "Inte ansluten"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5091,10 +4998,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "Datakonflikter"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -5103,21 +5009,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Spara nuvarande data."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5127,37 +5032,37 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Hämta alla ofullständiga sträckor och noder i relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "Hämta medlemmar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5167,31 +5072,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
-msgstr "Bekräfta fjärrstyrd handling"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Zooma ut"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "Flytta vald medlem/valda medlemmar nedåt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5252,7 +5150,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "Hämta urval"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -5286,7 +5183,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "Byt plats"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6419,5 +6315,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Geotaggade bilder"
@@ -6443,5 +6339,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6460,5 +6356,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG-bilder (*.jpg)"
@@ -6496,43 +6392,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "gps-punkt"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Anpassa linjeritning"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Använd globala inställningar"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Rita linjer mellan punkter i detta lager."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Rita inte linjer mellan punkter i detta lager."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Välj alternativ för linjeritning"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Anpassa färger"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6540,6 +6436,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6613,10 +6509,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Omvandla till datalager"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6627,11 +6523,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6640,29 +6536,29 @@
 msgstr "Omvandlad från:{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 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:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "Hämta allting inom:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "Största tillåtna område per begäran:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6673,9 +6569,9 @@
 "Önskar du<br>fortsätta?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 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:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6685,5 +6581,5 @@
 "än dess slut uteslöts eller flyttades till början."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6735,5 +6631,5 @@
 msgstr "Omvandla till gpx-lager"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6758,5 +6654,5 @@
 msgstr[1] "spår"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -6764,5 +6660,5 @@
 msgstr[1] "punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6771,5 +6667,5 @@
 msgstr[1] "ett spår med {0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6778,5 +6674,5 @@
 msgstr[1] "{0} består av {1} spår"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6785,9 +6681,9 @@
 msgstr[1] "{0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "gps-markör"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -6795,5 +6691,5 @@
 msgstr[1] "markörer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6802,14 +6698,14 @@
 msgstr[1] "{0} består av {1} markörer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "Synkronisera ljud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 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:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6817,14 +6713,14 @@
 msgstr "Ljud synkroniserat vid punkt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 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:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 msgid "Make Audio Marker at Play Head"
 msgstr "Skapa ljudmarkör vid spelhuvud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6834,13 +6730,13 @@
 "markören."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Visa/Dölj text/ikoner"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Växla visning av markörtext och ikoner."
@@ -7893,7 +7789,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -7965,4 +7861,9 @@
 msgstr "Förbereder data..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "Kunde inte öppna \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -7974,7 +7875,69 @@
 msgstr "Kunde inte öppna \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Obs: GPL är inte kompatibelt med OSM-licensen. Skicka inte in spår under GPL-"
+"licens."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "GPX-filer"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "beskrivning av gps-spår"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Lägg till information om upphovsman"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "Namn"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr "E-mail"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Copyright (URL)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Fördefinierad"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "Copyrightår"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Nyckelord"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Exportalternativ"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "Exportera och spara"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Fel vid export av {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Välj en fördefinierad licens"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -8002,4 +7965,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Tolkningsfel: ogiltig dokumentstruktur för gpx-dokument"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Okänd roll ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8132,7 +8100,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "Läser igenom folder {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8147,4 +8115,5 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8176,4 +8145,32 @@
 msgstr "Logga in"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "OSM serverfiler"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, fuzzy, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr "förväntade instans av OsmDataLayer eller GpxLayer. Erhöll \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8231,30 +8228,26 @@
 msgstr "Fel vid tolkning."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "OSM serverfiler"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Okänd version"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr "Hittade element av typen <nd> på icke-sträcka"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "<nd> har nollreferens"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "Fann <member>-tagg utanför relation."
@@ -8304,5 +8297,5 @@
 msgstr "Det nödvändiga attributet \"{0}\" saknas."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8311,9 +8304,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "Okänd medlemstyp för ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "Förbereder OSM-data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "Felformaterad nod-id"
@@ -8438,9 +8436,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "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."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8536,7 +8532,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "Kunde inte hitta någon information om insticksmoduler."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8927,23 +8922,23 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Fel vid läsning av filer från folder {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr "Korrelerar med GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} hittades med gps-taggar."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "Öppna bilder med AgPifoJ..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9194,5 +9189,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Fel vid läsning av fil"
@@ -9241,28 +9236,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr "Automatkälla"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr "Ogiltig kartprojektion"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr "Ändra projektionen till {0} först."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the JOSM projection to Lambert and restart"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9271,9 +9251,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
@@ -9439,13 +9419,20 @@
 msgstr "Extrahera byggnadskonturer"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr "Hämta bild från den franska Cadastre-WMS:en"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Cadastre: {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9512,5 +9499,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr "Justera WMS"
@@ -10236,22 +10223,27 @@
 msgstr "Kunde inte skaffa en bild"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr "Ansluten"
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr "Inte ansluten"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr "Anslutning misslyckades"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "namn"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10284,33 +10276,33 @@
 msgstr "LiveGPS-lager"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
 msgstr "Fånga GPS-spår"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 "Anslut till en gpsd-server och visa nuvarande position i ett LiveGPS-lager."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center Once"
 msgstr "Centrera en gång"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center the LiveGPS layer to current position."
 msgstr "Centrera LiveGPS-lagret runt nuvarande position."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr "Autocentrera"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Centrera kontinuerligt LiveGPS-lagret runt nuvarande position."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -10556,24 +10548,24 @@
 msgstr "Tillåtna handlingar"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Fjärrstyrning har begärts för att hämta data från API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detaljer om begäran: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr "Vill du tillåta detta?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr "Bekräfta fjärrstyrd handling"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Fjärrstyrning har begärts för att importera data från följande URL:"
@@ -10814,10 +10806,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
+#, fuzzy, java-format
+msgid "{0} start"
 msgstr "början"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr "slut"
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} nod"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11361,10 +11355,10 @@
 msgstr "Korsande sträckor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr "Dubbletter av noder"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
@@ -12045,9 +12039,33 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr "Justera valt WMS-lagers läge"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "Välj vilken rad du vill ändra."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "Ta bort lager"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Start adjusting"
+msgstr "Påbörja ruttberäkning"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "Det finns inte några ändringar att skicka in."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -12060,57 +12078,57 @@
 msgstr "Automatisk hämtning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-lager ({0}), hämtas automatiskt i zoomläge {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-lager ({0}), hämtas i zoomläge {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr "Den begärda ytan är för stor. Zooma in lite eller ändra upplösning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Hämta de rutor som syns"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Ändra upplösning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Läs om felaktiga rutor"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Alfakanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Spara WMS-lagret till en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "Hämta WMS-lager från en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "WMS-filversion som ej stöds; funnen {0}, förväntad {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Fel filformat"
@@ -12697,5 +12715,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -15252,5 +15270,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15552,5 +15570,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15653,5 +15671,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -20277,7 +20295,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "motorsport"
+msgstr ""
 
 #. color tertiary
@@ -23456,5 +23473,5 @@
 msgstr "Mindre tätort/Stad"
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23465,5 +23482,5 @@
 msgstr "Enkelriktat"
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23473,5 +23490,5 @@
 msgstr "Kyrka"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23482,5 +23499,5 @@
 msgstr "Bensinstation"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23491,5 +23508,5 @@
 msgstr "Handel"
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23499,5 +23516,5 @@
 msgstr "WC"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23730,31 +23747,116 @@
 msgstr ""
 
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Misslyckades att initialisera API. Vänligen försök igen senare."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Misslyckades att initialisera API."
-
-#~ 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 "No data"
-#~ msgstr "Inga data"
-
-#~ msgid "Update failed"
-#~ msgstr "Uppdatering misslyckades"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Primitiv saknas"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Lager: {0}"
+#~ msgid "Unknown file extension."
+#~ msgstr "Okänd filändelse."
+
+#~ msgid "Move"
+#~ msgstr "Flytta"
+
+#~ msgid "Invalid projection"
+#~ msgstr "Ogiltig kartprojektion"
+
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Ändra projektionen till {0} först."
+
+#~ msgid "end"
+#~ msgstr "slut"
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ msgid "unnamed"
+#~ msgstr "namnlös"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM-användarnamn (email)"
+
+#~ msgid "Aborting..."
+#~ msgstr "Avbryter..."
+
+#~ msgid "Not implemented yet."
+#~ msgstr "Inte implementerat ännu."
+
+#~ msgid "Change"
+#~ msgstr "Ändra"
+
+#~ msgid "Rotate"
+#~ msgstr "Rotera"
+
+#~ msgid "Resolve {0} conflicts in {1} objects"
+#~ msgstr "Jämka {0} konflikter i {1} objekt"
+
+#~ msgid "position"
+#~ msgstr "position"
+
+#~ msgid "different"
+#~ msgstr "olik"
+
+#~ msgid "false"
+#~ msgstr "falsk"
+
+#~ msgid "true"
+#~ msgstr "sann"
+
+#~ 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 "resolved version:"
+#~ msgstr "jämkad version:"
+
+#~ msgid "Revert"
+#~ msgstr "Återgå"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Jämka konflikter"
+
+#~ msgid "Data Layer"
+#~ msgstr "Datalager"
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Taggar (tomt värde tar bort taggen)"
+
+#~ 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 "Remove the member in the current table row from this relation"
 #~ msgstr "Ta bort medlemmen på den nuvarande tabellraden från denna relation"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Ansluter till OSM-servern"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Användarnamn (epost) för OSM-kontot"
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Kunde inte hämta insticksmodul: {0} från {1}"
 
 #~ msgid ""
@@ -23765,4 +23867,25 @@
 #~ "JOSM från."
 
+#~ 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 "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME Fix)"
+
+#~ msgid "Adjust the position of the WMS layer"
+#~ msgstr "Justera WMS-lagrets position"
+
 #~ msgid "Validate"
 #~ msgstr "Validera"
@@ -23770,120 +23893,4 @@
 #~ msgid "Validate either current selection or complete dataset."
 #~ msgstr "Validera antingen nuvarande urval eller hela datasetet."
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid "unnamed"
-#~ msgstr "namnlös"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-användarnamn (email)"
-
-#~ msgid "Aborting..."
-#~ msgstr "Avbryter..."
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Inte implementerat ännu."
-
-#~ msgid "Change"
-#~ msgstr "Ändra"
-
-#~ msgid "Rotate"
-#~ msgstr "Rotera"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Jämka {0} konflikter i {1} objekt"
-
-#~ msgid "position"
-#~ msgstr "position"
-
-#~ msgid "different"
-#~ msgstr "olik"
-
-#~ msgid "false"
-#~ msgstr "falsk"
-
-#~ msgid "true"
-#~ msgstr "sann"
-
-#~ 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 "resolved version:"
-#~ msgstr "jämkad version:"
-
-#~ msgid "Revert"
-#~ msgstr "Återgå"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Jämka konflikter"
-
-#~ msgid "Data Layer"
-#~ msgstr "Datalager"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Taggar (tomt värde tar bort taggen)"
-
-#~ 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 "Contacting the OSM server..."
-#~ msgstr "Ansluter till OSM-servern"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Användarnamn (epost) för OSM-kontot"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Kunde inte hämta insticksmodul: {0} från {1}"
-
-#~ 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 "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME Fix)"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Justera WMS-lagrets position"
 
 #~ msgid "Navigation"
@@ -24058,4 +24065,7 @@
 #~ "{0}"
 
+#~ msgid "Layers: {0}"
+#~ msgstr "Lager: {0}"
+
 #~ msgid "Conflicts: {0}"
 #~ msgstr "Konflikter: {0}"
@@ -24094,7 +24104,4 @@
 #~ msgid "Delete and Download"
 #~ msgstr "Ta bort och hämta hem"
-
-#~ msgid "No intersections found. Nothing was changed."
-#~ msgstr "Inga tvärsnitt hittades. Ingenting har ändrats."
 
 #~ msgid "sports"
@@ -24130,4 +24137,11 @@
 #~ 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:"
@@ -24136,7 +24150,4 @@
 #~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
 #~ msgstr "Lambertzon {0} i cache inkompatibel med nuvarande Lambertzon {1}"
-
-#~ msgid "Start routing"
-#~ msgstr "Påbörja ruttberäkning"
 
 #~ msgid "Remove route nodes"
@@ -24210,2 +24221,17 @@
 #~ msgid "Selection too big"
 #~ msgstr "Markering för stor"
+
+#~ msgid "Missing primitive"
+#~ msgstr "Primitiv saknas"
+
+#~ msgid "Update failed"
+#~ msgstr "Uppdatering misslyckades"
+
+#~ msgid "Failed to initialize API. Please try again later."
+#~ msgstr "Misslyckades att initialisera API. Vänligen försök igen senare."
+
+#~ msgid "API initialization failed"
+#~ msgstr "Misslyckades att initialisera API."
+
+#~ msgid "No data"
+#~ msgstr "Inga data"
Index: /applications/editors/josm/i18n/po/tr.po
===================================================================
--- /applications/editors/josm/i18n/po/tr.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/tr.po	(revision 16973)
@@ -10,6 +10,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-07-14 17:53+0000\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-04 10:56+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Türkçe\n"
@@ -18,13 +18,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:33+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -49,15 +42,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -82,7 +67,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -90,4 +75,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -109,8 +98,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Hata"
@@ -121,5 +112,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "Saklanılmayan Çalışmalar"
@@ -139,16 +130,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -160,13 +150,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -183,4 +174,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "İptal"
@@ -194,5 +186,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -201,5 +193,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -210,23 +203,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -247,5 +240,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "Uyarı"
@@ -279,5 +272,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -310,5 +303,5 @@
 msgstr "Hata raporları"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -369,19 +362,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "Silmek için bir satır seçiniz."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "Şunların Arasında Seçiniz:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "Kavşakları Birleştir"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -420,5 +410,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -451,18 +441,18 @@
 msgstr "Boylam"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "Daire içindeki kavşakları hizala"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Seçili kavşakları daire içine taşı."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -491,18 +481,18 @@
 msgstr "Araç: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "Lütfen en az dört kavşak seçiniz."
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -515,5 +505,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -636,13 +626,13 @@
 msgstr "Çeşitli yolları birine birleştir."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Lütfen birleştirmek için en az iki yol seçiniz."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "Farklı sınıflardaki yolları birleştir?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -652,13 +642,13 @@
 "istiyormusunuz?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "Yöneleri değiştir?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -668,9 +658,9 @@
 "istermisiniz?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -679,5 +669,5 @@
 msgstr "Bütün çelişkilere değer ver."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -685,14 +675,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0} yolu birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "Bütün yollar boştu"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -709,24 +699,23 @@
 msgstr "Seçili objeleri yapıştır alanına (buffer) kopyala."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "Lütfen kopyalama için seçim yapınız"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Daire Oluştur"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Seçili üç noktadan daire oluştur."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "Noktalar daire içinde değiller."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -738,8 +727,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -759,15 +748,15 @@
 msgstr "Seçili Objeleri Sil."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "Üzerine Yaz"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "Dosya mevcut. Üzerine Yaz?"
@@ -828,5 +817,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -836,7 +825,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "İlişkilerde Karışıklık"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -847,5 +835,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "Çift"
@@ -869,92 +858,36 @@
 msgstr "Programı Kapat."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Not: OSM lisansı ile GPL lisansı birbirne uygun değil. GPL lisanslı izleri "
-"yüklemek istermisiniz?"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "GPX Yap..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "GPX dosyasına çevir."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Çevirecek bişey yok. Biraz bilgi edinin."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "gps iz tanımı"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "Yazar bilgisi ekle"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "gerçek İsim"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "Copyright (URL)"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "Öntanımlı"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "Copyright yılı"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "Anahtar kelimeler"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "Dışarı verme opsiyonları"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"Dışarı vermede hata {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "Ön tanımlı lisans seçiniz"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "GPX dosyasına çevir."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -970,6 +903,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1040,5 +973,5 @@
 msgstr "Kavaşağı en yakın yol segmentine birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "Yol ve Kavşağı birleştir"
@@ -1049,12 +982,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "Takayı yeniden isimlerdir"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "Bu takayı seçili tabakanın altına koy."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1096,12 +1027,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "selection"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Seçili üyeyi aşağı taşı"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1161,5 +1090,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "Yeni"
@@ -1234,5 +1163,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
-#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1240,7 +1168,4 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 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?"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1254,5 +1179,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "Yapıştır"
@@ -1264,5 +1189,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "Etiketleri Yapıştır"
@@ -1310,7 +1235,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Dosyaya isim verilemedi \"{0}\"."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1347,5 +1272,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "Döküman açık değil Kayıt yapılamaz."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1355,25 +1285,25 @@
 "bildiriniz"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "Döküman açık değil Kayıt yapılamaz."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "Boş döküman"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "Çelişkiler"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1381,57 +1311,19 @@
 msgstr "Çözülmemiş çelişkiler var. Çelişkiler kaydedilmeyecektir! Devam?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "OSM dosyası olarak sakla"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "GPX olarak sakla"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Yedek dosyası oluşturulamadı."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "Bilinmeyen Dosya Uzantısı: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr "Kaydetme sırasında bir hata oluştu."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr "Yedek dosyası içeri alınırken hata oluştu."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "Bilinmeyen dosya uzantısı."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "Kaydetme sırasında bir hata oluştu."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr "Yedek dosyası içeri alınırken hata oluştu."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1537,23 +1429,17 @@
 "Yol seçili kavşaktan bölünemez. (İpucu: Yolun ortasından kavşak seçiniz)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
 "should verify this and correct it when necessary.</html>"
 msgstr ""
-"Rol tabanlı ilişki bütün yeni yollara kopyalandı.\n"
-"Gerek duyulursa kontrol edilmeli"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
-#, fuzzy
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
 "this and correct it when necessary.</html>"
 msgstr ""
-"Rol tabanlı ilişki bütün yeni yollara kopyalandı.\n"
-"Gerek duyulursa kontrol edilmeli"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1692,7 +1578,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
-#, fuzzy
 msgid "No current dataset found"
-msgstr "GPX veri tabaksı bulunamadı."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
@@ -1805,7 +1690,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "Bütün değişiklikleri OSM server'ına yükle."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1963,7 +1847,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "Bilgi yükleniyor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
@@ -2008,5 +1891,5 @@
 msgstr "Mode: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2016,6 +1899,6 @@
 "kavşakları silmebir yol silerken. Ctrl:referans objelerini sil"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2026,8 +1909,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2072,38 +1955,38 @@
 msgstr "seçilmiş"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "Dünya dışına bir kavşak ekleyemezsiniz."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Kavşak Ekle"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Yola kavşak ekle"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "Varolan yolu kavşağa ekle"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Varolan yola kavaşka ekle"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "Yola kavşak ekle ve birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2112,14 +1995,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr ""
@@ -2139,5 +2022,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Dikdörtgendeki objeleri seçmek için fare düğmesini bırakınız."
@@ -2149,5 +2032,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "Dönmeyi durdurmak için fare düğmesini bırakınız."
@@ -2184,9 +2067,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2196,13 +2079,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2211,5 +2094,5 @@
 "yapıştır."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2428,26 +2311,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr "or için eksik argüman."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr "not için eksik argüman."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "Parantezlerin kapanması beklenir."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2456,5 +2339,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2543,8 +2426,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "Çelişki"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2556,10 +2438,10 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "''{0}'' için herhangi karşılık bulunamadı"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2603,5 +2485,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr ""
@@ -2616,5 +2498,5 @@
 "İlişkiden Sil?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr "Yol segmentini ayrıştır"
@@ -2622,5 +2504,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2631,8 +2514,7 @@
 "objeler onu kullanıyor olabilir. <br>Gerçekten silmek istiyormusunuz?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "Özelliği Sil"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2642,9 +2524,221 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Taşı"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "{0} Kavşak birleştirildi"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "{0} Kavşak"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Sıra"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Uygula?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"Bu yolu terslerken şu yolun özelliği ve onun sahip olduğu kavşalarında "
+"değişmesidata bütünlüğü için önerilir."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "İlişki"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Eski Rol"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "Yeni Rol"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Eski Anahtar"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Eski Değer"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Yeni Anahtar"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "Yeni Değer"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Seçili değişiklikleri uygula"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Değişiklikleri Uygulama"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "lütfen hangi özelliğin değişimin uygulanacağını seçiniz."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Özellikleri "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr "İlişkide rolü şunu gösteriyor"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Otomatic etiket düzetmesi"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Tercihler klasörü açılamıyor: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr "Tercihler dosyasında hata. Eskisi yedek olarak kullanılıyor {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Tercihler {0} üzerinde saklanıldı"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Could not upload preferences. Reason: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "Tercihler serverdan alınamadı."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "Ondalık Derece"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "Derece Dakika Saniye"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "G"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "K"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "B"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "D"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "{0} Objeyi Değiştir"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "eksik"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2657,210 +2751,4 @@
 msgstr[0] "kavşak"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Sıra"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Uygula?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"Bu yolu terslerken şu yolun özelliği ve onun sahip olduğu kavşalarında "
-"değişmesidata bütünlüğü için önerilir."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "İlişki"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "Eski Rol"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "Yeni Rol"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Eski Anahtar"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Eski Değer"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Yeni Anahtar"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "Yeni Değer"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "Seçili değişiklikleri uygula"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "Değişiklikleri Uygulama"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "lütfen hangi özelliğin değişimin uygulanacağını seçiniz."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "Özellikleri "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr "İlişkide rolü şunu gösteriyor"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "Otomatic etiket düzetmesi"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Tercihler klasörü açılamıyor: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr "Tercihler dosyasında hata. Eskisi yedek olarak kullanılıyor {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Tercihler {0} üzerinde saklanıldı"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Could not upload preferences. Reason: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "Tercihler serverdan alınamadı."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "Ondalık Derece"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "Derece Dakika Saniye"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "G"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "K"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "B"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "D"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "eksik"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2891,5 +2779,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2921,5 +2809,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -2927,22 +2815,22 @@
 msgstr[0] "{0} üye"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "Karayolu"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "demiryolu"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "suyolu"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "arazi kullanımı"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -3006,10 +2894,12 @@
 msgstr "multipoligon yolu ''{0}'' kapalı değil."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "İlişkide boş üye."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3017,5 +2907,5 @@
 msgstr "''{0}'' üyesini ilişkiden sil."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3023,57 +2913,57 @@
 msgstr "Yol ''{0}'' iki noktadan az içeriyor."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3125,5 +3015,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3157,4 +3047,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3189,13 +3083,25 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "Yer imleçleri okunamadı."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "Yer imleçleri yazılamadı."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3228,4 +3134,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3257,16 +3164,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "Beklenmedik Durum"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
 msgstr ""
-"OSM server'ına bağlantı sağlanamadı. Lütfen internet bağlantınızı kontol "
-"ediniz."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3496,6 +3400,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3524,39 +3428,39 @@
 msgstr "Ses"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "Sağa Git"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "Harita: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "Sola Git"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "Yukarı Git"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "Aşağı"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "İçeri Zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "Dışarı Zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "ölçek"
@@ -3590,10 +3494,10 @@
 msgstr "(obje yok)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "tabaka listede yok."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3675,12 +3579,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3689,6 +3593,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3696,47 +3600,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Üyeler"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#, java-format
+msgid "{0} pending tag conflicts to be resolved"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
-#, java-format
-msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3744,25 +3648,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
@@ -3962,8 +3866,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4182,5 +4086,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4193,5 +4097,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4226,6 +4130,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4238,6 +4142,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4308,7 +4212,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4371,7 +4275,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "Kapanmamış yollar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4398,7 +4301,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Çelişkileri Çözümle"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4447,99 +4350,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "Tabakalar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "Yüklenilmiş olan tabakaların listesini göster."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "Seçili tabakayı sil."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "Kayıt edilmemiş çalışmalar var. Buna rağmen tabaka silinsin mi?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "Gerçekten bütün tabakayı silmek istiyor musunuz?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "Bilgi"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "Evet"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "K"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "Sil"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "Sil {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "Göster/Sakla"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "Seçili tabakanın görünen kısmını sabitle."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "özel"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "Seçili tabakayı sil."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "Bu takayı seçili tabakanın altına koy."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "Seçili tabakayı bir satır yukarı taşı."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "Seçili tabakayı bir satır aşağı taşı."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "Bilgi"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4547,22 +4443,22 @@
 msgstr[0] "İşlem {0} objeyi değiştirecek."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "Boş değer anahtarı sildi."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<farklı>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "Değerleri Değiştir?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4570,5 +4466,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4576,49 +4472,40 @@
 msgstr[0] "Değerleri {0} obje için değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "Lütfen bir anahtar seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "Lütfen bir değer seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 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/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "Özellikler/Üyelikler"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "Seçili objenin özellikleri"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "Üyesi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "İlişkiyi değiştir"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, 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/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "Özellik Ekle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4635,63 +4522,77 @@
 msgstr "Ekle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 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/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "Özellikleri Değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 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/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Özellik: {0} / Üyelik: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "Özellik / Üyelik"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "İlişkiyi değiştir"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, 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/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "Seçili anahtarı her objeden sil"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "Özelliği Sil"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "Seçili anahtarı her objeden sil"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Özellik: {0} / Üyelik: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "Özellik / Üyelik"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "İlişkiler"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "İlişkilerin listesini göster."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "İlişkiler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Seçili ilişki için bir editör aç."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Seçili ilişkiyi sil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "Yeni ilişki oluştur"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4722,5 +4623,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4786,5 +4687,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -4795,21 +4696,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "Alanı indir"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "Seçili ilişkiyi sil"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "Görünen mozaikleri indir"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr ""
@@ -4828,17 +4726,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "İlişkiler"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "Bilgi İndiriliyor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -4856,7 +4753,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "İlişkiler"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -4867,9 +4763,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -4878,15 +4774,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "Son bitmemiş komutu tekrar yap."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -4896,9 +4791,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -4908,15 +4803,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -4924,5 +4819,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -4930,65 +4825,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
+#, fuzzy
+msgid "Select primitives for selected relation members"
+msgstr "Seçili ilişkiyi sil"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "Seçili üyeyi yukarı taşı"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "Seçili üyeyi aşağı taşı"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "Seçili üyeyi aşağı taşı"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "Seçili ilişkiyi sil"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr "Bağlı Değil"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -4997,10 +4907,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "İlişkilerde Karışıklık"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -5009,21 +4918,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "Şimdiki bilgiyi kaydet."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5033,37 +4941,37 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Bütün eksik yolları ve kavşakları ilişkili olarak indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "Üyeleri İndir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5073,31 +4981,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
-msgstr "uzak kontrol haereketini onayla"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "Zoom Out"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "Seçili üyeyi aşağı taşı"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5158,7 +5059,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "Seçili alanı yükle"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -5192,7 +5092,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "seçime ekleyiniz"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6322,5 +6221,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Geotagged Görüntüler"
@@ -6346,5 +6245,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6362,5 +6261,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG görüntüsü (*.jpg)"
@@ -6398,43 +6297,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "gps noktası"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Çizimi özelleştir"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Genel ayarları kullan."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Bu tabaka için çizgiler arasını birleştir."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Bu tabaka için çizgileri birleştirme."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Çizim seçeneklerini seçiniz"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Renkleri Ayarla"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6442,6 +6341,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6512,10 +6411,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Bilgi tabakasına çevir"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6526,11 +6425,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6539,29 +6438,29 @@
 msgstr "Çevrildiği yer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr "OSM den bu izi indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "Bunun içindeki herşeyi indir:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metre"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "Her istek için max. alan:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6572,9 +6471,9 @@
 "istiyor musunuz?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 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:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6582,5 +6481,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6631,5 +6530,5 @@
 msgstr "GPX tabakasına çevir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6653,10 +6552,10 @@
 msgstr[0] "iz"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
 msgstr[0] "nokta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6664,5 +6563,5 @@
 msgstr[0] "{0} noktalı iz"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6670,5 +6569,5 @@
 msgstr[0] "{0} {1} izden oluşur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6676,14 +6575,14 @@
 msgstr[0] "{0} nokta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "gps imleçi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
 msgstr[0] "imleç"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6691,14 +6590,14 @@
 msgstr[0] "{0} {1} imleçten oluşur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "Sesi Eşle"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 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:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6706,14 +6605,14 @@
 msgstr "Ses {0} noktasında eşlendi."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 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:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 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:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6721,13 +6620,13 @@
 msgstr "Sesi işaretlemek istediğinizde çalan kaydı durdurmanız gerekir."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 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:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "Göster/Sakla Metin/İkon"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Görünen metin ve ikonları sabitle."
@@ -7744,7 +7643,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -7815,4 +7714,9 @@
 msgstr "Bilgiler hazırlanıyor..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "Okunamadı \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -7824,7 +7728,69 @@
 msgstr "Okunamadı \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Not: OSM lisansı ile GPL lisansı birbirne uygun değil. GPL lisanslı izleri "
+"yüklemek istermisiniz?"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "gps iz tanımı"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "Yazar bilgisi ekle"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "gerçek İsim"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "Copyright (URL)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "Öntanımlı"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "Copyright yılı"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "Anahtar kelimeler"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Dışarı verme opsiyonları"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Dışarı vermede hata {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "Ön tanımlı lisans seçiniz"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -7852,4 +7818,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Ayrıştırma hatası: gpx dökümanı için geçersiz yapı."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "Tanımsız host"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -7982,7 +7953,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "Klasör aranıyor {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -7997,4 +7968,5 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8026,4 +7998,32 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8081,30 +8081,26 @@
 msgstr "Ayrıştırma sırasında hata oluştu."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "Bilinmeyen versiyon"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr "<nd>-bileşene erişelemdi."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr "<nd> in içi boş"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "<member>. eleman ile bağlantı bulunamadı."
@@ -8154,5 +8150,5 @@
 msgstr "Gerekli özellik eksik \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8161,9 +8157,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, java-format
+msgid "Unknown relation member type {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr "Yanlış tanımlı kavşak bilgisi"
@@ -8288,7 +8289,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
-msgstr "Uyarı - {0} eklentisi istenildi. Eklenti artık gerekli değil."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8378,7 +8379,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "Eklenti bilgisi bulunamadı."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8764,23 +8764,23 @@
 msgstr "Klasörde null dosya bulundu {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Klasörden dosya alınmasında hata oluştu {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr "GPX e göre ilişkilendir"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} gps için etiketlenecek bulundu."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "AgPifoJ ile görüntü aç..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9028,5 +9028,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Dosya Yüklemede Sorun"
@@ -9073,28 +9073,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the JOSM projection to Lambert and restart"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9103,9 +9088,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
@@ -9265,12 +9250,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
 msgstr ""
 
@@ -9337,5 +9329,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr "WMS ayarla"
@@ -10055,22 +10047,27 @@
 msgstr "Görünüt alınamadı"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr "Bağlanıyor"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr "Bağlı"
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr "Bağlı Değil"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr "Bağlantı Hatası"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "sism"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10103,33 +10100,33 @@
 msgstr "Canlı GPS tabakası"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
 msgstr "GPS izini takip et"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 "gpsd server ına bağlan ve şu anki pozsiyonu CanlıGPS tabakasında göster"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center Once"
 msgstr "Merkeze koy"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center the LiveGPS layer to current position."
 msgstr "Canlı GPS verilerini tabakadfa merkeze koy."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr "Otomatik-Merkezleme"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Devamlı olarak canlı GPS tabakasını görüntünün ortasına getir"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr "Canlı GPS"
@@ -10371,24 +10368,24 @@
 msgstr "Onaylanan Hareket"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr "API tarafından uzaktan kontrol veri yüklemesi soruldu."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr "İstek Detayı: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr "Buna izin veriyormusunuz?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr "uzak kontrol haereketini onayla"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Şu linkten uzak kontrolle veri alınmak istenildi.Link:"
@@ -10627,10 +10624,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
+#, fuzzy, java-format
+msgid "{0} start"
 msgstr "başla"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr "bitiş"
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} Kavşak"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11160,10 +11159,10 @@
 msgstr "kesişine yollar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr "Çift Noktalar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Bu test aynı lokasyonda birden fazla nokta varmı kontrol eder."
@@ -11832,9 +11831,32 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "Editlemek için bir satır seçiniz."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "WMS Tabakası"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+msgid "Start adjusting"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "Yüklenilecek değişiklik yok."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11847,15 +11869,15 @@
 msgstr "Otomatik indir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS tabaksı ({0}), otomatik indirildi, görüntü seviyesi {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS tabakası ({0}), görüntü seviyesi {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -11864,42 +11886,42 @@
 "değiştirin"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Görünen mozaikleri indir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Çözünürlüğü değiştir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "WMS tabakasını dosyaya kaydet"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "WMS tabakasını dosyadan yükle"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Desteklenmeyen WMS versiyonu; bulunan {0}, istenen {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Dosya Format Hatası"
@@ -12485,5 +12507,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -15040,5 +15062,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15340,5 +15362,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15441,5 +15463,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -20065,7 +20087,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "motor"
+msgstr ""
 
 #. color tertiary
@@ -23244,5 +23265,5 @@
 msgstr "Köy/Şehir"
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23253,5 +23274,5 @@
 msgstr "tek Yol"
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23261,5 +23282,5 @@
 msgstr "klise"
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23270,5 +23291,5 @@
 msgstr "Benzin İstasyonu"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23279,5 +23300,5 @@
 msgstr "Alışveriş"
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23287,5 +23308,5 @@
 msgstr "WC"
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23518,9 +23539,12 @@
 msgstr ""
 
-#~ msgid "Layers: {0}"
-#~ msgstr "Tabakalar: {0}"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Seçili satırdaki üyeyi bu ilişkiden kaldır"
+#~ msgid "Unknown file extension."
+#~ msgstr "Bilinmeyen dosya uzantısı."
+
+#~ msgid "Move"
+#~ msgstr "Taşı"
+
+#~ msgid "end"
+#~ msgstr "bitiş"
 
 #~ msgid ""
@@ -23528,10 +23552,4 @@
 #~ "about the problem."
 #~ msgstr "Eklenti kaldırılamıyor, Lütfen JOSM u edindiğiniz yere danışın"
-
-#~ msgid "Validate"
-#~ msgstr "Onayla"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Aktif seçimi veya bütün veriyi onayla."
 
 #~ msgid ""
@@ -23572,4 +23590,7 @@
 #~ 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 "There were conflicts during import."
 #~ msgstr "İçeri taşıma esnasında karşıklık oluştu."
@@ -23600,4 +23621,7 @@
 #~ msgid "Not implemented yet."
 #~ msgstr "Henuz Yapılmadı."
+
+#~ msgid "Layers: {0}"
+#~ msgstr "Tabakalar: {0}"
 
 #~ msgid "Conflicts: {0}"
@@ -23748,4 +23772,10 @@
 #~ "Yakınlaştır:FareTekeri veya çift Klik. Harita Taşı: Sağ klik ve fareyi "
 #~ "oynat.Seçim:Klik"
+
+#~ msgid "Validate"
+#~ msgstr "Onayla"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Aktif seçimi veya bütün veriyi onayla."
 
 #~ msgid "image not loaded"
Index: /applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- /applications/editors/josm/i18n/po/zh_TW.po	(revision 16972)
+++ /applications/editors/josm/i18n/po/zh_TW.po	(revision 16973)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-04 11:43+0200\n"
-"PO-Revision-Date: 2009-07-25 06:09+0000\n"
+"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"PO-Revision-Date: 2009-08-04 11:03+0000\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Traditional Chinese\n"
@@ -16,14 +16,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-08-04 09:34+0000\n"
+"X-Launchpad-Export-Date: 2009-08-10 11:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
-
-#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
-#, java-format
-msgid ""
-"Failed to access system property ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
@@ -48,15 +41,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
@@ -81,7 +66,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
@@ -89,4 +74,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
@@ -108,8 +97,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "錯誤"
@@ -120,5 +111,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
 msgid "Unsaved Changes"
 msgstr "未儲存的變更"
@@ -138,16 +129,15 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
@@ -159,13 +149,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -182,4 +173,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Cancel"
 msgstr "取消"
@@ -193,5 +185,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:450
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
@@ -200,5 +192,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
@@ -209,23 +202,23 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
@@ -246,5 +239,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 msgid "Warning"
 msgstr "警告"
@@ -278,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -309,5 +302,5 @@
 msgstr "程式臭蟲回報"
 
-#. <button label="Camping" hotkey="Z" icon="caravan">
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
@@ -368,19 +361,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#, fuzzy
 msgid "Please select the target layer."
-msgstr "請選擇要刪除的列。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-#, fuzzy
 msgid "Select target layer"
-msgstr "選擇其一："
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge"
-msgstr "合併節點"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -419,5 +409,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 #, java-format
 msgid "Edit: {0}"
@@ -450,18 +440,18 @@
 msgstr "經度"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
 msgid "Align Nodes in Circle"
 msgstr "將節點排成圓"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "將選取的節點移動到圓圈裡。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -490,18 +480,18 @@
 msgstr "工具：{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 msgid "Please select at least four nodes."
 msgstr "請選取至少四個節點"
 
 #. FIXME: not sure whether this fits in a dialog
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
@@ -514,5 +504,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
@@ -635,13 +625,13 @@
 msgstr "合併多個路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "請選擇至少兩個以上的路徑來合併"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid "Combine ways with different memberships?"
 msgstr "是否組合有不同關係成員的路徑？"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -649,13 +639,13 @@
 msgstr "選取的路徑有不同的關係成員。是否仍要將它們組合？"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
 msgid "Combine Anyway"
 msgstr "合併，不管怎樣"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid "Change directions?"
 msgstr "改變路徑方向?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -663,9 +653,9 @@
 msgstr "以這些路徑目前的方向是不能組合的。是否要將它們中的一部分反轉？"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Reverse and Combine"
 msgstr "反轉後組合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
@@ -674,5 +664,5 @@
 msgstr "輸入所有衝突項目的數值。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
@@ -680,14 +670,14 @@
 msgstr "解決衝突"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
 #, java-format
 msgid "Combine {0} ways"
 msgstr "組合 {0} 條路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
 msgid "All the ways were empty"
 msgstr "所有的路徑都是空的"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -704,24 +694,23 @@
 msgstr "複製選取的物件到剪貼簿"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
 msgid "Please select something to copy."
 msgstr "請選擇物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "建立圓形"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "從三個選取的節點建立圓形。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "那些節點不在一個圓上。"
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -733,8 +722,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -754,15 +743,15 @@
 msgstr "刪除選擇的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
 msgid "Overwrite"
 msgstr "覆寫"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
 msgstr "檔案已存在，要覆蓋嗎?"
@@ -823,5 +812,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
@@ -831,7 +820,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
-#, fuzzy
 msgid "Conflicts during download"
-msgstr "下載時發生錯誤"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -842,5 +830,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
 msgid "Duplicate"
 msgstr "重製"
@@ -864,90 +853,36 @@
 msgstr "離開程式"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr "注意：GPL 與 OSM 授權並不相容，請勿上傳 GPL 授權的軌跡。"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "匯出到 GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "匯出資料到 GPX 檔案"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "沒有東西可匯出。請先取得一些資料。"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr "參數「{0}」不能為空值(null)"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr "預期為 OsmDataLayer 或 GpxLayer 的實體。卻取得「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
-msgid "gps track description"
-msgstr "gps 軌跡描述"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
-msgid "Add author information"
-msgstr "加入作者資訊"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
-msgid "Real name"
-msgstr "本名"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
-msgid "Copyright (URL)"
-msgstr "授權 {URL}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
-msgid "Predefined"
-msgstr "預先定義的"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
-msgid "Copyright year"
-msgstr "版權年份"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
-msgid "Keywords"
-msgstr "設定鍵"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
-msgid "Export options"
-msgstr "匯出選項"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
-msgid "Export and Save"
-msgstr "匯出並存檔"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-"匯出時發生錯誤 {0}:\n"
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
-msgid "Choose a predefined license"
-msgstr "選擇預先定義的授權"
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#, fuzzy
+msgid "Export GPX file"
+msgstr "匯出資料到 GPX 檔案"
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -963,6 +898,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
@@ -1035,5 +970,5 @@
 msgstr "將節點連結到最近的路徑區段"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
 msgid "Join Node and Line"
 msgstr "連結節點與直線"
@@ -1044,12 +979,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge layer"
-msgstr "圖層更名"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-#, fuzzy
 msgid "Merge the current layer into another layer"
-msgstr "將下列圖層直接合併至選取的圖層。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
@@ -1091,12 +1024,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
-#, fuzzy
 msgid "Merge selection"
-msgstr "選取"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#, fuzzy
 msgid "Merge the currently selected primitives into another layer"
-msgstr "將目前選取的成員下移"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1156,5 +1087,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339
 msgid "New"
 msgstr "新增"
@@ -1229,5 +1160,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
-#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1235,6 +1165,4 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 msgstr ""
-"<html>您所使用的 EPSG:4326 投影法在進行矩形對齊時<br>可能會造成不想要的結果。"
-"<br>請改變您的投影法以避開這個警告。<br>是否要繼續？"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1248,5 +1176,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
 msgid "Paste"
 msgstr "貼上"
@@ -1258,5 +1186,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74
 msgid "Paste Tags"
 msgstr "貼上標籤"
@@ -1303,7 +1231,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
-#, fuzzy, java-format
+#, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "無法重新命名檔案 \"{0}\"。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1340,5 +1268,10 @@
 msgstr "檔案 {0} 已存在。是否覆蓋？"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#, fuzzy
+msgid "No Exporter found! Nothing saved."
+msgstr "找不到交叉點。沒有東西變更。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1346,25 +1279,25 @@
 msgstr "內部的錯誤：不能檢查無圖層的條件。請將它回報為程式錯誤。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "No document open so nothing to save."
 msgstr "尚未開啟文件故沒有可儲存的項目。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Empty document"
 msgstr "空的文件"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "The document contains no data."
 msgstr "文件沒有包含資料。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
 msgid "Save anyway"
 msgstr "強制儲存"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
 msgid "Conflicts"
 msgstr "衝突"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1372,57 +1305,19 @@
 msgstr "尚有未解決的衝突。如果您全部拒絕就不會儲存衝突。是否繼續？"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
 msgid "Reject Conflicts and Save"
 msgstr "拒絕衝突項目並儲存"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save OSM file"
 msgstr "儲存 OSM 檔案"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
 msgid "Save GPX file"
 msgstr "儲存 GPX 檔案"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
 msgid "Save Layer"
 msgstr "儲存圖層"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
-#, fuzzy, java-format
-msgid "Could not back up file. Exception is: {0}"
-msgstr "無法備份檔案。"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#, fuzzy, java-format
-msgid "Unknown file extension for file ''{0}''"
-msgstr "不明的延伸檔名：{0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
-#, fuzzy, java-format
-msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-msgstr "<html>與伺服器溝通時發生錯誤<br>詳細資料：{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
-"html>"
-msgstr "在還原備份檔案時發生錯誤。"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
-msgid "Unknown file extension."
-msgstr "不明的延伸檔名。"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
-#, fuzzy, java-format
-msgid "An error occurred while saving. Error is: {0}"
-msgstr "存檔時發生錯誤"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
-#, fuzzy, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr "在還原備份檔案時發生錯誤。"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
@@ -1524,21 +1419,17 @@
 msgstr "此路徑不能從選取的節點分割。（提示：選取的節點在路徑的中央。）"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
 "should verify this and correct it when necessary.</html>"
-msgstr "以角色為基礎的關係成員已複製到所有新的路徑。"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
 "this and correct it when necessary.</html>"
 msgstr ""
-"關係成員已複製到所有的新路徑。\n"
-"您應該進行檢驗並在必要時修正它。"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1674,7 +1565,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
-#, fuzzy
 msgid "No current dataset found"
-msgstr "找不到 GPX 資料圖層。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
@@ -1790,7 +1680,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
-#, fuzzy
 msgid "upload all changes in one request"
-msgstr "將所有的變更上傳至 OSM 伺服器。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1948,12 +1837,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
-#, fuzzy
 msgid "Updating data"
-msgstr "更新資料"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr "在大量下載時發生下列錯誤："
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -1993,5 +1881,5 @@
 msgstr "模式：{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2001,6 +1889,6 @@
 "Ctrl：刪除參考的物件。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -2011,8 +1899,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2057,38 +1945,38 @@
 msgstr "已選取"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 msgid "Cannot add a node outside of the world."
 msgstr "不能在這個世界以外的地方加入節點。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "加入節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "將節點加入路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "將既存的路徑連接到節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "在既存的路徑加入新的節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "將節點加入路徑並連接"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
 msgid "Create new node."
 msgstr "建立新的節點。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
 msgid "Select node under cursor."
 msgstr "選取游標下的節點。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 #, java-format
 msgid "Insert new node into way."
@@ -2096,14 +1984,14 @@
 msgstr[0] "插入新的節點到{0} 路徑中。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
 msgid "Start new way from last node."
 msgstr "從最後的節點開始新的路徑。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
 msgid "Continue way from last node."
 msgstr "從最後的節點繼續路徑。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
 msgid "Finish drawing."
 msgstr "結束繪製。"
@@ -2123,5 +2011,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "放開滑鼠按鈕以選擇矩形內的物件。"
@@ -2132,5 +2020,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to stop rotating."
 msgstr "放開滑鼠按鈕以停止旋轉。"
@@ -2165,9 +2053,9 @@
 msgstr[0] "加入並移動虛擬新節點至{0}路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 #, java-format
 msgid ""
@@ -2177,18 +2065,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr "放開滑鼠按鈕以停止移動。按 Ctrl 則會與最近的節點合併。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2413,26 +2301,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "未預期的記號：{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
 msgid "Missing arguments for or."
 msgstr "沒有 or 所需的引數。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
 msgid "Missing argument for not."
 msgstr "沒有 not 所需的引數。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
 msgid "Expected closing parenthesis."
 msgstr "需要關閉括弧。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
 msgid "Wrong number of parameters for nodes operator."
 msgstr "給 nodes 運算子錯誤的參數數量。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
 #, java-format
 msgid ""
@@ -2443,5 +2331,5 @@
 "nodes:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2530,8 +2418,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr "解決衝突"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2543,10 +2430,10 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
-#, fuzzy, java-format
+#, java-format
 msgid "Add conflict for ''{0}''"
-msgstr "找不到「{0}」的符合項"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
@@ -2590,5 +2477,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
 msgid "Delete from relation"
 msgstr "自關係中刪除"
@@ -2603,5 +2490,5 @@
 "是否自關係中刪除？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
 msgid "Split way segment"
 msgstr "分割路徑區段"
@@ -2609,5 +2496,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2618,8 +2506,7 @@
 "看到的）可能會使用它們。<br>確定要刪除嗎？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr "自關係中刪除"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2629,9 +2516,221 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "移動"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "合併 {0} 個節點"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr "警告：將清除路徑 {0}，因為其節點數已低於 2。目前為 {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr "解決關係 {0} 的成員清單的衝突"
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "{0} 節點"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "次序"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr "解決 {1} {2} 中的 {0} 標籤衝突"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr "解決 {0} {1} 的版本衝突"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr "解決路徑 {0} 的節點清單衝突"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "是否接受？"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"在反轉這條路徑時，為了維持資料的一致性，建議下列對該路徑的屬性與其節點的變"
+"更。"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "關係"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "舊的角色"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "新的角色"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "舊的設定鍵"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "舊的數值"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "新的設定鍵"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "新的數值"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "套用選取的變更"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "不要套用變更"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "請選擇要接受的屬性變更。"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "屬性 "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr "關係中的角色參照到"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "自動修正標籤"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "設定檔案第 {0} 行格式不良"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "不能開啓偏好設定目錄：{0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr "偏好設定檔案有錯誤。將舊檔案備份到 {0}。"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "偏好設定儲存於 {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "無法上傳偏好設定。理由：{0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "無法從伺服器載入偏好設定。"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+msgid "Decimal Degrees"
+msgstr "十進位經緯度"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+msgid "Degrees Minutes Seconds"
+msgstr "度-分-秒格式"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "S"
+msgstr "南"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+msgid "N"
+msgstr "北"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "W"
+msgstr "西"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+msgid "E"
+msgstr "東"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#, fuzzy, java-format
+msgid "Changeset {0}"
+msgstr "變更組合"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#, java-format
+msgid "parameter {0} > 0 required. Got {1}."
+msgstr "參數 {0} 必須 > 0 。得到 {1}。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
+msgid "incomplete"
+msgstr "不完整"
+
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2644,210 +2743,4 @@
 msgstr[0] "節點"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr "警告：將清除路徑 {0}，因為其節點數已低於 2。目前為 {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr "解決關係 {0} 的成員清單的衝突"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "次序"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr "解決 {1} {2} 中的 {0} 標籤衝突"
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr "解決 {0} {1} 的版本衝突"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr "解決路徑 {0} 的節點清單衝突"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "是否接受？"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"在反轉這條路徑時，為了維持資料的一致性，建議下列對該路徑的屬性與其節點的變"
-"更。"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
-msgid "Relation"
-msgstr "關係"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
-msgid "Old role"
-msgstr "舊的角色"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
-msgid "New role"
-msgstr "新的角色"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "舊的設定鍵"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "舊的數值"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "新的設定鍵"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
-msgid "New value"
-msgstr "新的數值"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Apply selected changes"
-msgstr "套用選取的變更"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
-msgid "Don't apply changes"
-msgstr "不要套用變更"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
-msgid "Please select which property changes you want to apply."
-msgstr "請選擇要接受的屬性變更。"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
-msgid "Properties of "
-msgstr "屬性 "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
-msgid "Roles in relations referring to"
-msgstr "關係中的角色參照到"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
-msgid "Automatic tag correction"
-msgstr "自動修正標籤"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "設定檔案第 {0} 行格式不良"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "不能開啓偏好設定目錄：{0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr "偏好設定檔案有錯誤。將舊檔案備份到 {0}。"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "偏好設定儲存於 {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "無法上傳偏好設定。理由：{0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-msgid "Could not load preferences from server."
-msgstr "無法從伺服器載入偏好設定。"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
-msgid "Decimal Degrees"
-msgstr "十進位經緯度"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
-msgid "Degrees Minutes Seconds"
-msgstr "度-分-秒格式"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "S"
-msgstr "南"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
-msgid "N"
-msgstr "北"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "W"
-msgstr "西"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
-msgid "E"
-msgstr "東"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "參數 {0} 必須 > 0 。得到 {1}。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
-msgid "incomplete"
-msgstr "不完整"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
@@ -2878,5 +2771,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2908,5 +2801,5 @@
 msgstr "參數「{0}」不是可接受的類別，取得「{1}」"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:113
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
 #, java-format
 msgid "{0} member"
@@ -2914,22 +2807,22 @@
 msgstr[0] "{0} 成員"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
 msgid "highway"
 msgstr "公路"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "鐵路"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
 msgid "waterway"
 msgstr "航道"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
 msgid "landuse"
 msgstr "土地利用"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
@@ -2993,10 +2886,12 @@
 msgstr "多邊形路徑「{0}」並未封閉。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "關係中的成員是空的。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
@@ -3004,5 +2899,5 @@
 msgstr "關係中已刪除的成員「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
@@ -3010,57 +2905,57 @@
 msgstr "路徑「{0}」少於兩個節點。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
 msgid "More than one \"from\" way found."
 msgstr "找到一個以上「從」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
 msgid "More than one \"to\" way found."
 msgstr "找到一個以上「到」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
 msgid "More than one \"via\" found."
 msgstr "找到一個以上的「經過」。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "不明的角色「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "「{0}」的不明成員類型。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
 msgid "No \"from\" way found."
 msgstr "找不到「從」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "No \"to\" way found."
 msgstr "找不到「到」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "No \"via\" node or way found."
 msgstr "找到一個以上「經過」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "「從」路徑沒有開始或結束於「經過」節點。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "「到」路徑沒有開始或結束於「經過」節點。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "「從」路徑沒有開始或結束於「經過」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "「到」路徑沒有開始或結束於「經過」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
 #, java-format
 msgid "Style for restriction {0} not found."
@@ -3112,5 +3007,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
 #, java-format
 msgid ""
@@ -3144,4 +3039,8 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
 msgstr ""
 
@@ -3181,13 +3080,25 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr "無法讀取書籤。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "無法寫入書籤。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3222,4 +3133,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
@@ -3251,14 +3163,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
-#, fuzzy
 msgid "Security exception"
-msgstr "未預期的例外"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
-msgstr "無法連線到 osm 伺服器。請檢查您的網際網路連線。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
@@ -3267,5 +3178,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -3273,11 +3184,8 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-"初始化與 OSM 伺服器 {0} 的連線失敗。\n"
-"請檢查您的偏好設定中的伺服器 URL 和網際網路連線。"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
-#, fuzzy
 msgid "Unknown host"
-msgstr "不明的記錄格式"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
@@ -3488,6 +3396,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
@@ -3516,39 +3424,39 @@
 msgstr "音效"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
 msgid "Move right"
 msgstr "右移"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 #, java-format
 msgid "Map: {0}"
 msgstr "地圖：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
 msgid "Move left"
 msgstr "左移"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
 msgid "Move up"
 msgstr "上移"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
 msgid "Move down"
 msgstr "下移(_D"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
 msgid "Zoom in"
 msgstr "拉近"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
 msgid "Zoom out"
 msgstr "拉遠"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
 msgid "scale"
 msgstr "縮放"
@@ -3582,10 +3490,10 @@
 msgstr "(沒有物件)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
 msgid "layer not in list."
 msgstr "圖層不在清單中。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3667,12 +3575,12 @@
 msgstr "角色 {0} 沒有參與比較配對 {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Properties"
 msgstr "屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
@@ -3681,6 +3589,6 @@
 msgstr "標籤"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3688,47 +3596,47 @@
 msgstr "節點"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "沒有待解決的標籤衝突"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "標籤({0} 衝突)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} 個標籤衝突待解決"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "節點(已解決)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr "合併的節點清單已凍結。這個路徑的節點清單中沒有待解決的衝突"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "節點(有衝突)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "這個路徑的節點清單中待解決的衝突"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "成員(已解決)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3736,25 +3644,25 @@
 msgstr "合併的節點清單已凍結。這個關係的成員清單中沒有待解決的衝突"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "成員(有衝突)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr "這個關係的成員清單中待解決的衝突"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr "沒有待解決的衝突"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "屬性(有衝突)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr "待解決的屬性衝突"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "衝突的決議"
@@ -3951,8 +3859,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
@@ -4175,5 +4083,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4186,5 +4094,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr "合併的節點尚未凍結。不能建置決議指令"
@@ -4219,6 +4127,6 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4231,6 +4139,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4301,7 +4209,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
@@ -4364,7 +4272,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
-#, fuzzy
 msgid "Close anyway"
-msgstr "強制繼續"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4373,5 +4280,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>You didn''t finish to merge the differences in this conflict."
@@ -4381,7 +4288,4 @@
 "<strong>{1}</strong> to return to resolving conflicts.</html>"
 msgstr ""
-"<html>您並未完全解決所有的衝突。<br>點選 <strong>{0}</strong> 強制接受已解決"
-"的衝突。<br>您可以稍後解決剩下的衝突。<br>點選 <strong>{1}</strong> 返回以解"
-"決衝突。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210
@@ -4394,7 +4298,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "解決 {0} {1} 的版本衝突"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4443,99 +4347,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
 msgid "Layers"
 msgstr "圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
 msgid "Open a list of all loaded layers."
 msgstr "開啟所有載入圖層的清單。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
 msgid "Delete the selected layer."
 msgstr "刪除選取的圖層。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "還有未儲存的變更。是否強制刪除圖層？"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
 msgid "Delete Layer"
 msgstr "刪除圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr "確定要刪除整個圖層？"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr "資訊"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
 msgid "Yes"
-msgstr "是"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
 msgid "No"
-msgstr "北"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 msgid "Delete all"
-msgstr "刪除"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr "刪除 {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
 msgid "Show/Hide"
 msgstr "顯示/隱藏"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
 msgid "Toggle visible state of the selected layer."
 msgstr "切換選取的圖層可見性狀態。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate"
-msgstr "私人的"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr "刪除選取的圖層。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
 msgid "Merge this layer into another layer"
-msgstr "將下列圖層直接合併至選取的圖層。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
 msgid "Move the selected layer one row up."
 msgstr "將選取的圖層上移一列。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
 msgid "Move the selected layer one row down."
 msgstr "將選取的圖層下移一列。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
-#, fuzzy
 msgid "Information about layer"
-msgstr "資訊板"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
 #, java-format
 msgid "This will change up to {0} object."
@@ -4543,22 +4440,22 @@
 msgstr[0] "這會改變 {0} 個物件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "An empty value deletes the key."
 msgstr "空白的數值會刪除該設定鍵。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<不同>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
 msgid "Change values?"
 msgstr "是否改變數值？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
 #, java-format
 msgid ""
@@ -4566,5 +4463,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4572,49 +4469,40 @@
 msgstr[0] "改變屬性至 {0} 個物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Please select a key"
 msgstr "請選擇一個設定鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
 msgid "Please select a value"
 msgstr "請選擇一個數值"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Please select the objects you want to change properties for."
 msgstr "請選擇您要改變屬性的物件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties/Memberships"
 msgstr "屬性/成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 msgid "Properties for selected objects."
 msgstr "選取物件的屬性。"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
 msgid "Member Of"
 msgstr "成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
-msgid "Change relation"
-msgstr "改變關係"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
-#, java-format
-msgid "Really delete selection from relation {0}?"
-msgstr "確定要刪除關係 {0} 的選擇區域？"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add Properties"
 msgstr "加入屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4631,63 +4519,77 @@
 msgstr "加入"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Add a new key/value pair to all objects"
 msgstr "將新的設定鍵/數值配對加入到所有的物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit Properties"
 msgstr "編輯屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 msgid "Edit the value of the selected key for all objects"
 msgstr "編輯所有物件選取設定鍵的數值"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "屬性：{0} / 成員：{1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+msgid "Properties / Memberships"
+msgstr "屬性 / 成員"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+msgid "Change relation"
+msgstr "改變關係"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "確定要刪除關係 {0} 的選擇區域？"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+msgid "Delete the selected key in all objects"
+msgstr "刪除所有物件中選取的設定鍵"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
 msgid "Delete Properties"
 msgstr "删除屬性"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-msgid "Delete the selected key in all objects"
-msgstr "刪除所有物件中選取的設定鍵"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#, java-format
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "屬性：{0} / 成員：{1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
-msgid "Properties / Memberships"
-msgstr "屬性 / 成員"
 
 #. item "Land use/Quarry" text "Name"
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
 msgid "Open a list of all relations."
 msgstr "開啓所有關係的清單。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
 #, java-format
 msgid "Relations: {0}"
 msgstr "關係：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "開啓選取的關係編輯器"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "刪除選取的關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
 msgid "Create a new relation"
 msgstr "建立新的關係"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
@@ -4718,5 +4620,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4782,5 +4684,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -4791,21 +4693,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
-#, fuzzy
 msgid "Download All Children"
-msgstr "下載區域"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
-#, fuzzy
 msgid "Download selected relations"
-msgstr "刪除選取的關係"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
-#, fuzzy
 msgid "Download Selected Children"
-msgstr "下載可見的拼貼"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533
 msgid "Download relation members"
 msgstr ""
@@ -4824,17 +4723,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
-#, fuzzy
 msgid "Relation is deleted"
-msgstr "尚未選取關係"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading relation {0}"
-msgstr "正在下載外掛程式 {0}..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -4852,7 +4750,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#, fuzzy
 msgid "Child Relations"
-msgstr "關係"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -4863,9 +4760,9 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -4874,15 +4771,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr "從關係中移除元件"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
 #, java-format
 msgid ""
@@ -4892,9 +4788,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 #, java-format
 msgid ""
@@ -4904,15 +4800,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -4920,5 +4816,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -4926,65 +4822,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
+#, fuzzy
+msgid "Select primitives for selected relation members"
+msgstr "刪除選取的關係"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Move the currently selected members up"
 msgstr "將目前選取的成員上移"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Move the currently selected members down"
 msgstr "將目前選取的成員下移"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr "將所有目前選取的物件從關係中移除"
+msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr "刪除選取的關係"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr "繼續解決"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -4993,10 +4904,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr "衝突的關係"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #, java-format
 msgid ""
@@ -5005,21 +4915,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr "儲存現在的資料"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -5029,37 +4938,37 @@
 msgstr "確定"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "下載關係中所有不完整的路徑和節點"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352
 msgid "Download Members"
 msgstr "下載成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 #, java-format
 msgid ""
@@ -5069,32 +4978,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
-msgstr "是，清除它"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
-msgstr "確認遠端控制動作"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
-msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
-#, fuzzy
 msgid "Zoom to"
-msgstr "拉起"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
-#, fuzzy
 msgid "Zoom to primitive the first selected member refers to"
-msgstr "將目前選取的成員下移"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
@@ -5155,7 +5056,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
-#, fuzzy
 msgid "Load relation"
-msgstr "載入選擇區域"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -5188,7 +5088,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#, fuzzy
 msgid "Name of location"
-msgstr "改變位置"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -6320,5 +6219,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "有 Geotag 的圖片"
@@ -6344,5 +6243,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
 msgid_plural "images"
@@ -6360,5 +6259,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG 圖片 (*.jpg)"
@@ -6396,43 +6295,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "gps 點"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "自訂線條的繪製"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "使用全域設定值。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "在這個圖層的各點之間繪出線條。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "在這個圖層的各點之間不要繪出線條。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "選擇線條繪製選項"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "自訂顏色"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -6440,6 +6339,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6510,10 +6409,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "轉換為資料圖層"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6524,11 +6423,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6537,29 +6436,29 @@
 msgstr "轉換自：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 msgid "Download from OSM along this track"
 msgstr "從 OSM 沿這條軌跡下載"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid "Download everything within:"
 msgstr "下載這裡面的每個物件："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #, java-format
 msgid "{0} meters"
 msgstr "{0} 公尺"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 msgid "Maximum area per request:"
 msgstr "每個要求最大區域："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} 平方公里"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 #, java-format
 msgid ""
@@ -6569,9 +6468,9 @@
 "<html>這個動作會發出 {0} 個<br>個別的下載要求。您是否希望<br>繼續？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "No GPX track available in layer to associate audio with."
 msgstr "在圖層中沒有可用的 GPX 軌跡可供音效關聯。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6579,5 +6478,5 @@
 msgstr "部分航點的時刻戳記早於軌跡起點或晚於終點會被忽略或是移至起點。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6627,5 +6526,5 @@
 msgstr "轉換為 GPX 圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -6649,10 +6548,10 @@
 msgstr[0] "軌跡"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
 msgstr[0] "點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -6660,5 +6559,5 @@
 msgstr[0] "有 {0} 個點的軌跡"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6666,5 +6565,5 @@
 msgstr[0] "{0} 由 {1} 軌跡組成"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -6672,14 +6571,14 @@
 msgstr[0] "{0} 點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "gps 標記"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
 msgstr[0] "標記"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6687,14 +6586,14 @@
 msgstr[0] "{0} 由 {1} 標記組成"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
 msgid "Synchronize Audio"
 msgstr "同步音效"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
 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:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
@@ -6702,14 +6601,14 @@
 msgstr "音效同步於點 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 msgid "Unable to synchronize in layer being played."
 msgstr "在播放時無法於圖層同步。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6717,13 +6616,13 @@
 msgstr "您需要在軌跡上想標記的點暫停音效。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
 msgid "No existing audio markers in this layer to offset from."
 msgstr "這個圖層中沒有既存的音效標記可位移。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Show/Hide Text/Icons"
 msgstr "顯示/隱藏文字/圖示"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
 msgstr "切換標記文字和圖示的可見性狀態。"
@@ -7327,7 +7226,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
-#, fuzzy
 msgid "JOSM Plugin description URL"
-msgstr "加入 JOSM 外掛程式描述 URL。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
@@ -7729,7 +7627,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -7800,4 +7698,9 @@
 msgstr "正在準備資料..."
 
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, fuzzy, java-format
+msgid "Could not export \"{0}\""
+msgstr "不能讀取 \"{0}\""
+
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
@@ -7809,7 +7712,67 @@
 msgstr "不能讀取 \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr "注意：GPL 與 OSM 授權並不相容，請勿上傳 GPL 授權的軌跡。"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
 msgid "GPX Files"
 msgstr "GPX 檔案"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+msgid "gps track description"
+msgstr "gps 軌跡描述"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+msgid "Add author information"
+msgstr "加入作者資訊"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+msgid "Real name"
+msgstr "本名"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+msgid "Copyright (URL)"
+msgstr "授權 {URL}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+msgid "Predefined"
+msgstr "預先定義的"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+msgid "Copyright year"
+msgstr "版權年份"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+msgid "Keywords"
+msgstr "設定鍵"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "匯出選項"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export and Save"
+msgstr "匯出並存檔"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"匯出時發生錯誤 {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+msgid "Choose a predefined license"
+msgstr "選擇預先定義的授權"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
@@ -7837,4 +7800,9 @@
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "分析錯誤：gpx 文件有無效的文件結構"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#, fuzzy, java-format
+msgid "Unknown mode {0}."
+msgstr "不明的角色「{0}」。"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -7967,7 +7935,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
-#, fuzzy, java-format
+#, java-format
 msgid "Starting retry {0} of {1}."
-msgstr "正在掃描目錄 {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -7982,4 +7950,5 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
@@ -8011,4 +7980,32 @@
 msgstr "登入"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+msgid "OSM Server Files"
+msgstr "OSM 伺服器檔案"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#, fuzzy, java-format
+msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+msgstr "預期為 OsmDataLayer 或 GpxLayer 的實體。卻取得「{0}」。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
@@ -8066,30 +8063,26 @@
 msgstr "分析時發生錯誤。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
-msgid "OSM Server Files"
-msgstr "OSM 伺服器檔案"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
 msgid "Unknown version"
 msgstr "不明的版本"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
 msgid "Version number missing from OSM data"
 msgstr "OSM 資料缺少版本編號"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
 #, java-format
 msgid "Unknown version: {0}"
 msgstr "不明的版本：{0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
 msgid "Found <nd> element in non-way."
 msgstr "在非-路徑中發現 <nd> 元件。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 msgid "<nd> has zero ref"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
 msgid "Found <member> element in non-relation."
 msgstr "在非-關係中發現 <member> 元件。"
@@ -8139,5 +8132,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -8146,9 +8139,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#, fuzzy, java-format
+msgid "Unknown relation member type {0}"
+msgstr "「{0}」的不明成員類型。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 msgid "Prepare OSM data..."
 msgstr "準備 OSM 資料..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Ill-formed node id"
 msgstr ""
@@ -8270,7 +8268,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
-msgstr "警告 - 要求 {0} 外掛程式的載入。這個外掛程式已不再需要。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8355,7 +8353,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
-#, fuzzy
 msgid "Plugin information"
-msgstr "找不到外掛程式資訊。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8739,23 +8736,23 @@
 msgstr "在目錄 {0} 找到空的檔案\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "從目錄 {0} 取得檔案時發生錯誤\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr "關聯到 GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "已發現 {0} 具有 GPS 標籤。"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
 msgid "Open images with AgPifoJ..."
 msgstr "以 AgPifoJ 開啟圖片..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
@@ -9002,5 +8999,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "載入檔案有錯誤"
@@ -9049,30 +9046,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:130
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
 msgstr "自動來源"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
-msgid "Invalid projection"
-msgstr "無效的投影"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
-#, java-format
-msgid "Change the projection to {0} first."
-msgstr "先將投影改變為 {0}。"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
-msgid ""
-"To enable the cadastre WMS plugin, change\n"
-"the JOSM projection to Lambert and restart"
-msgstr ""
-"要啓用 cadastre WMS 外掛程式，請將\n"
-"JOSM 投影改為蘭勃特投影後重新啟動"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9084,9 +9064,9 @@
 "您是否想要回復以 F11 作為抓取動作？"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
 msgid "Restore grab shortcut F11"
 msgstr "回復抓取捷徑鍵 F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM 已停止以便讓變更生效。"
@@ -9248,13 +9228,23 @@
 msgstr "解開建築足跡"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
 msgstr "從法國 Cadastre WMS 下載圖片"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Cadastre: {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
+#, fuzzy
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projection and retry"
+msgstr ""
+"要啓用 cadastre WMS 外掛程式，請將\n"
+"JOSM 投影改為蘭勃特投影後重新啟動"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9322,5 +9312,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust WMS"
 msgstr "調整 WMS"
@@ -10042,22 +10032,27 @@
 msgstr "無法擷取圖片"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
 msgid "Connecting"
 msgstr "正在連線"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
 msgid "Connected"
 msgstr "已連線"
 
 #. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:216
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
 msgid "Not connected"
 msgstr "未連線"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
 msgid "Connection Failed"
 msgstr "連線失敗"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#, fuzzy
+msgid "no name"
+msgstr "名稱"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10090,32 +10085,32 @@
 msgstr "LiveGPS 圖層"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
 msgstr "擷取 GPS 軌跡"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr "連線至 gpsd 伺服器並在 LiveGPS 圖層中顯示目前的位置。"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center Once"
 msgstr "置中一次"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center the LiveGPS layer to current position."
 msgstr "將 LiveGPS 圖層置中於目前的位置。"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr "自動置中"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "持續將 LiveGPS 圖層置中到目前的位置。"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -10359,24 +10354,24 @@
 msgstr "准許的動作"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 msgid "Remote Control has been asked to load data from the API."
 msgstr "遠端控制被要求自 API 下載資料。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 #, java-format
 msgid "Request details: {0}"
 msgstr "要求的詳細資料：{0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
 msgid "Do you want to allow this?"
 msgstr "您是否要允許這個？"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
 msgid "Confirm Remote Control action"
 msgstr "確認遠端控制動作"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "遠端控制被要求自下列 URL 匯入資料："
@@ -10615,10 +10610,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-msgid "start"
+#, fuzzy, java-format
+msgid "{0} start"
 msgstr "開始"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-msgid "end"
-msgstr "結束"
+#, fuzzy, java-format
+msgid "{0} end"
+msgstr "{0} 節點"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11144,10 +11141,10 @@
 msgstr "路徑交叉"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "Duplicated nodes"
 msgstr "重複的節點"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "這會測試有沒有位置非常相近的節點存在。"
@@ -11830,9 +11827,32 @@
 msgstr "沒有有效的 WMS URL 或 id"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
 msgid "Adjust the position of the selected WMS layer"
 msgstr "調整選取的 WMS 圖層的位置"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#, fuzzy
+msgid "Please select the WMS layer to adjust."
+msgstr "請選擇要編輯的列。"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#, fuzzy
+msgid "Select WMS layer"
+msgstr "儲存 WMS 圖層"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+msgid "Start adjusting"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
+#, fuzzy
+msgid "No layers to adjust"
+msgstr "沒有要上傳的變更。"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11847,57 +11867,57 @@
 msgstr "自動下載"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS 圖層 ({0})，於縮放 {1} 自動下載"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS 圖層 ({0})，於縮放 {1} 下載"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr "要求的區域太大。請拉近一點，或是改變解析度"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "下載可見的拼貼"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "改變解析度"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "重新載入錯誤的拼貼"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "透明色版"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "將 WMS 圖層儲存為檔案"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr "儲存 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "從檔案載入 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr "載入 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "不支援的 WMS 檔案版本；發現 {0}，應為 {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "檔案格式錯誤"
@@ -12501,5 +12521,5 @@
 #. item "Ways/Path" check "Oneway"
 #. item "Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="tunnel">
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="tunnel start"/>
@@ -15056,5 +15076,5 @@
 #. item "Car/Fuel" text "Operator"
 #. group "Bicycle"
-#. <button label="Village/City" hotkey="V" icon="place">
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -15356,5 +15376,5 @@
 
 #. group "Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="fuel">
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -15457,5 +15477,5 @@
 
 #. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="bed">
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
@@ -20081,7 +20101,6 @@
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:527
-#, fuzzy
 msgid "motorroad"
-msgstr "汽車專用"
+msgstr ""
 
 #. color tertiary
@@ -23260,5 +23279,5 @@
 msgstr ""
 
-#. <button label="Parking" hotkey="P" icon="parking">
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -23269,5 +23288,5 @@
 msgstr ""
 
-#. <button label="One Way" hotkey="O" icon="noentry">
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
@@ -23277,5 +23296,5 @@
 msgstr ""
 
-#. <button label="Church" hotkey="C" icon="church">
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
@@ -23286,5 +23305,5 @@
 msgstr "加油站"
 
-#. <button label="Restaurant" hotkey="R" icon="restaurant">
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
@@ -23295,5 +23314,5 @@
 msgstr "購物"
 
-#. <button label="Shopping" hotkey="S" icon="shopping">
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23303,5 +23322,5 @@
 msgstr ""
 
-#. <button label="WC" hotkey="W" icon="toilet">
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
@@ -23537,9 +23556,21 @@
 #~ msgstr "未命名的"
 
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "初始化 API 失敗。請稍後再試一次。"
-
-#~ msgid "API initialization failed"
-#~ msgstr "API 初始化失敗"
+#~ msgid "Unknown file extension."
+#~ msgstr "不明的延伸檔名。"
+
+#~ msgid "Move"
+#~ msgstr "移動"
+
+#~ msgid "Invalid projection"
+#~ msgstr "無效的投影"
+
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "先將投影改變為 {0}。"
+
+#~ msgid "end"
+#~ msgstr "結束"
+
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "節點中有部分(幾乎)在直線裡"
 
 #~ msgid ""
@@ -23548,65 +23579,48 @@
 #~ msgstr "找不到要更新的資料。您是否已經開啟或下載過資料圖層？"
 
-#~ msgid "No data"
-#~ msgstr "沒有資料"
-
 #~ msgid "Update failed"
 #~ msgstr "更新失敗"
 
+#~ msgid "Data Layer"
+#~ msgstr "資料圖層"
+
+#~ msgid "Change"
+#~ msgstr "改變"
+
+#~ msgid "Rotate"
+#~ msgstr "旋轉"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "衝突： {0}"
+
+#~ 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 "Move Down"
+#~ msgstr "下移"
+
+#~ msgid "Remove the member in the current table row from this relation"
+#~ msgstr "將目前表格列中的成員自這個關係中移除"
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "匯入時有衝突項目。"
+
+#~ msgid "Aborting..."
+#~ msgstr "正在中止..."
+
 #~ msgid "Apply partial resolutions"
 #~ msgstr "套用部分解決方案"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "圖層：{0}"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "將目前表格列中的成員自這個關係中移除"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr "無法移除此外掛程式。請告訴您取得 JOSM 地方的人們這個問題的情況。"
-
-#~ msgid "Validate"
-#~ msgstr "檢驗"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "檢驗目前的選擇區域或整個資料組合。"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "節點中有部分(幾乎)在直線裡"
-
-#~ msgid "Data Layer"
-#~ msgstr "資料圖層"
-
-#~ msgid "Change"
-#~ msgstr "改變"
-
-#~ msgid "Rotate"
-#~ msgstr "旋轉"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "衝突： {0}"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "標籤 (數值留空會刪除該標籤)"
-
-#~ msgid "Move Up"
-#~ msgstr "上移"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "將所有目前選取的物件加入為成員"
-
-#~ msgid "Move Down"
-#~ msgstr "下移"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "匯入時有衝突項目。"
-
-#~ msgid "Aborting..."
-#~ msgstr "正在中止..."
 
 #~ msgid "linked"
@@ -23693,4 +23707,9 @@
 #~ msgstr "YAHOO (WebKit GTK)"
 
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr "無法移除此外掛程式。請告訴您取得 JOSM 地方的人們這個問題的情況。"
+
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "忽略路徑，因為它包含不存在的節點：{0}\n"
@@ -23699,4 +23718,13 @@
 #~ msgstr "將 TCX 檔案匯入為 GPS 軌跡"
 
+#~ msgid "Validate"
+#~ msgstr "檢驗"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "檢驗目前的選擇區域或整個資料組合。"
+
+#~ msgid "Failed to initialize API. Please try again later."
+#~ msgstr "初始化 API 失敗。請稍後再試一次。"
+
 #~ msgid "Import TCX File..."
 #~ msgstr "匯入 TCX 檔案..."
@@ -23714,4 +23742,7 @@
 #~ msgstr "直接從 JOSM 載入 TCX 檔案。"
 
+#~ msgid "API initialization failed"
+#~ msgstr "API 初始化失敗"
+
 #~ msgid "image not loaded"
 #~ msgstr "尚未載入圖片"
@@ -23719,2 +23750,5 @@
 #~ msgid "image loading..."
 #~ msgstr "正在載入圖片..."
+
+#~ msgid "No data"
+#~ msgstr "沒有資料"